rev 5324 - trunk/packages/kdebase/debian/patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Tue Jan 16 19:06:16 CET 2007


Author: ana
Date: 2007-01-16 18:32:50 +0100 (Tue, 16 Jan 2007)
New Revision: 5324

Modified:
   trunk/packages/kdebase/debian/patches/98_buildprep.diff
Log:
kdebase buildprep. sorry.



Modified: trunk/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/98_buildprep.diff	2007-01-16 17:14:24 UTC (rev 5323)
+++ trunk/packages/kdebase/debian/patches/98_buildprep.diff	2007-01-16 17:32:50 UTC (rev 5324)
@@ -2,6204 +2,135 @@
 # vi: ft=diff
 --- acinclude.m4
 +++ acinclude.m4
-@@ -0,0 +1,12405 @@
-+##   -*- autoconf -*-
-+
-+dnl    This file is part of the KDE libraries/packages
-+dnl    Copyright (C) 1997 Janos Farkas (chexum at shadow.banki.hu)
-+dnl              (C) 1997,98,99 Stephan Kulow (coolo at kde.org)
-+
-+dnl    This file is free software; you can redistribute it and/or
-+dnl    modify it under the terms of the GNU Library General Public
-+dnl    License as published by the Free Software Foundation; either
-+dnl    version 2 of the License, or (at your option) any later version.
-+
-+dnl    This library is distributed in the hope that it will be useful,
-+dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+dnl    Library General Public License for more details.
-+
-+dnl    You should have received a copy of the GNU Library General Public License
-+dnl    along with this library; see the file COPYING.LIB.  If not, write to
-+dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+dnl    Boston, MA 02110-1301, USA.
-+
-+dnl IMPORTANT NOTE:
-+dnl Please do not modify this file unless you expect your modifications to be
-+dnl carried into every other module in the repository. 
-+dnl
-+dnl Single-module modifications are best placed in configure.in for kdelibs
-+dnl and kdebase or configure.in.in if present.
-+
-+# KDE_PATH_X_DIRECT
-+dnl Internal subroutine of AC_PATH_X.
-+dnl Set ac_x_includes and/or ac_x_libraries.
-+AC_DEFUN([KDE_PATH_X_DIRECT],
-+[
-+AC_REQUIRE([KDE_CHECK_LIB64])
-+
-+if test "$ac_x_includes" = NO; then
-+  # Guess where to find include files, by looking for this one X11 .h file.
-+  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-+
-+  # First, try using that file with no special directory specified.
-+AC_TRY_CPP([#include <$x_direct_test_include>],
-+[# We can compile using X headers with no special include directory.
-+ac_x_includes=],
-+[# Look for the header file in a standard set of common directories.
-+# Check X11 before X11Rn because it is often a symlink to the current release.
-+  for ac_dir in               \
-+    /usr/X11/include          \
-+    /usr/X11R6/include        \
-+    /usr/X11R5/include        \
-+    /usr/X11R4/include        \
-+                              \
-+    /usr/include/X11          \
-+    /usr/include/X11R6        \
-+    /usr/include/X11R5        \
-+    /usr/include/X11R4        \
-+                              \
-+    /usr/local/X11/include    \
-+    /usr/local/X11R6/include  \
-+    /usr/local/X11R5/include  \
-+    /usr/local/X11R4/include  \
-+                              \
-+    /usr/local/include/X11    \
-+    /usr/local/include/X11R6  \
-+    /usr/local/include/X11R5  \
-+    /usr/local/include/X11R4  \
-+                              \
-+    /usr/X386/include         \
-+    /usr/x386/include         \
-+    /usr/XFree86/include/X11  \
-+                              \
-+    /usr/include              \
-+    /usr/local/include        \
-+    /usr/unsupported/include  \
-+    /usr/athena/include       \
-+    /usr/local/x11r5/include  \
-+    /usr/lpp/Xamples/include  \
-+                              \
-+    /usr/openwin/include      \
-+    /usr/openwin/share/include \
-+    ; \
-+  do
-+    if test -r "$ac_dir/$x_direct_test_include"; then
-+      ac_x_includes=$ac_dir
-+      break
-+    fi
-+  done])
-+fi # $ac_x_includes = NO
-+
-+if test "$ac_x_libraries" = NO; then
-+  # Check for the libraries.
-+
-+  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-+  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-+
-+  # See if we find them without any special options.
-+  # Don't add to $LIBS permanently.
-+  ac_save_LIBS="$LIBS"
-+  LIBS="-l$x_direct_test_library $LIBS"
-+AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)],
-+[LIBS="$ac_save_LIBS"
-+# We can link X programs with no special library path.
-+ac_x_libraries=],
-+[LIBS="$ac_save_LIBS"
-+# 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}/` \
-+    /usr/X11/lib${kdelibsuff}           \
-+    /usr/X11R6/lib${kdelibsuff}         \
-+    /usr/X11R5/lib${kdelibsuff}         \
-+    /usr/X11R4/lib${kdelibsuff}         \
-+                                        \
-+    /usr/lib${kdelibsuff}/X11           \
-+    /usr/lib${kdelibsuff}/X11R6         \
-+    /usr/lib${kdelibsuff}/X11R5         \
-+    /usr/lib${kdelibsuff}/X11R4         \
-+                                        \
-+    /usr/local/X11/lib${kdelibsuff}     \
-+    /usr/local/X11R6/lib${kdelibsuff}   \
-+    /usr/local/X11R5/lib${kdelibsuff}   \
-+    /usr/local/X11R4/lib${kdelibsuff}   \
-+                                        \
-+    /usr/local/lib${kdelibsuff}/X11     \
-+    /usr/local/lib${kdelibsuff}/X11R6   \
-+    /usr/local/lib${kdelibsuff}/X11R5   \
-+    /usr/local/lib${kdelibsuff}/X11R4   \
-+                                        \
-+    /usr/X386/lib${kdelibsuff}          \
-+    /usr/x386/lib${kdelibsuff}          \
-+    /usr/XFree86/lib${kdelibsuff}/X11   \
-+                                        \
-+    /usr/lib${kdelibsuff}               \
-+    /usr/local/lib${kdelibsuff}         \
-+    /usr/unsupported/lib${kdelibsuff}   \
-+    /usr/athena/lib${kdelibsuff}        \
-+    /usr/local/x11r5/lib${kdelibsuff}   \
-+    /usr/lpp/Xamples/lib${kdelibsuff}   \
-+    /lib/usr/lib${kdelibsuff}/X11       \
-+                                        \
-+    /usr/openwin/lib${kdelibsuff}       \
-+    /usr/openwin/share/lib${kdelibsuff} \
-+    ; \
-+do
-+dnl Don't even attempt the hair of trying to link an X program!
-+  for ac_extension in a so sl; do
-+    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-+      ac_x_libraries=$ac_dir
-+      break 2
-+    fi
-+  done
-+done])
-+fi # $ac_x_libraries = NO
-+])
-+
-+
-+dnl ------------------------------------------------------------------------
-+dnl Find a file (or one of more files in a list of dirs)
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([AC_FIND_FILE],
-+[
-+$3=NO
-+for i in $2;
-+do
-+  for j in $1;
-+  do
-+    echo "configure: __oline__: $i/$j" >&AC_FD_CC
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&AC_FD_CC
-+      $3=$i
-+      break 2
-+    fi
-+  done
-+done
-+])
-+
-+dnl KDE_FIND_PATH(program-name, variable-name, list-of-dirs,
-+dnl	if-not-found, test-parameter, prepend-path)
-+dnl
-+dnl Look for program-name in list-of-dirs+$PATH.
-+dnl If prepend-path is set, look in $PATH+list-of-dirs instead.
-+dnl If found, $variable-name is set. If not, if-not-found is evaluated.
-+dnl test-parameter: if set, the program is executed with this arg,
-+dnl                 and only a successful exit code is required.
-+AC_DEFUN([KDE_FIND_PATH],
-+[
-+   AC_MSG_CHECKING([for $1])
-+   if test -n "$$2"; then
-+        kde_cv_path="$$2";
-+   else
-+        kde_cache=`echo $1 | sed 'y%./+-%__p_%'`
-+
-+        AC_CACHE_VAL(kde_cv_path_$kde_cache,
-+        [
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z "$6"; then  dnl Append dirs in PATH (default)
-+	  dirs="$3 $dirs"
-+        else  dnl Prepend dirs in PATH (if 6th arg is set)
-+	  dirs="$dirs $3"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/$1"; then
-+	    if test -n "$5"
-+	    then
-+              evalstr="$dir/$1 $5 2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/$1"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/$1"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+        ])
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+      AC_MSG_RESULT(not found)
-+      $4
-+   else
-+      AC_MSG_RESULT($kde_cv_path)
-+      $2=$kde_cv_path
-+
-+   fi
-+])
-+
-+AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
-+[
-+    AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-+Please check whether you installed Qt correctly.
-+You need to have a running moc binary.
-+configure tried to run $ac_cv_path_moc and the test didn't
-+succeed. If configure shouldn't have tried this one, set
-+the environment variable MOC to the right one before running
-+configure.
-+])
-+])
-+
-+AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
-+[
-+    AC_MSG_WARN([No Qt ui compiler (uic) found!
-+Please check whether you installed Qt correctly.
-+You need to have a running uic binary.
-+configure tried to run $ac_cv_path_uic and the test didn't
-+succeed. If configure shouldn't have tried this one, set
-+the environment variable UIC to the right one before running
-+configure.
-+])
-+])
-+
-+
-+AC_DEFUN([KDE_CHECK_UIC_FLAG],
-+[
-+    AC_MSG_CHECKING([whether uic supports -$1 ])
-+    kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'`
-+    AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache,
-+    [
-+        cat >conftest.ui <<EOT
-+        <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-+EOT
-+        ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null"
-+        if AC_TRY_EVAL(ac_uic_testrun); then
-+            eval "kde_cv_prog_uic_$kde_cache=yes"
-+        else
-+            eval "kde_cv_prog_uic_$kde_cache=no"
-+        fi
-+        rm -f conftest*
-+    ])
-+
-+    if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-+        AC_MSG_RESULT([yes])
-+        :
-+        $3
-+    else
-+        AC_MSG_RESULT([no])
-+        :
-+        $4
-+    fi
-+])
-+
-+
-+dnl ------------------------------------------------------------------------
-+dnl Find the meta object compiler and the ui compiler in the PATH,
-+dnl in $QTDIR/bin, and some more usual places
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([AC_PATH_QT_MOC_UIC],
-+[
-+   AC_REQUIRE([KDE_CHECK_PERL])
-+   qt_bindirs=""
-+   for dir in $kde_qt_dirs; do
-+      qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
-+   done
-+   qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
-+   if test ! "$ac_qt_bindir" = "NO"; then
-+      qt_bindirs="$ac_qt_bindir $qt_bindirs"
-+   fi
-+
-+   KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
-+   if test -z "$UIC_NOT_NEEDED"; then
-+     KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
-+     if test -z "$UIC_PATH" ; then
-+       KDE_UIC_ERROR_MESSAGE
-+       exit 1
-+     else
-+       UIC=$UIC_PATH
-+
-+       if test $kde_qtver = 3; then
-+         KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
-+         KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
-+
-+         if test x$ac_uic_supports_libpath = xyes; then
-+             UIC="$UIC -L \$(kde_widgetdir)"
-+         fi
-+         if test x$ac_uic_supports_nounload = xyes; then
-+             UIC="$UIC -nounload"
-+         fi
-+       fi
-+     fi
-+   else
-+     UIC="echo uic not available: "
-+   fi
-+
-+   AC_SUBST(MOC)
-+   AC_SUBST(UIC)
-+
-+   UIC_TR="i18n"
-+   if test $kde_qtver = 3; then
-+     UIC_TR="tr2i18n"
-+   fi
-+
-+   AC_SUBST(UIC_TR)
-+])
-+
-+AC_DEFUN([KDE_1_CHECK_PATHS],
-+[
-+  KDE_1_CHECK_PATH_HEADERS
-+
-+  KDE_TEST_RPATH=
-+
-+  if test -n "$USE_RPATH"; then
-+
-+     if test -n "$kde_libraries"; then
-+       KDE_TEST_RPATH="-R $kde_libraries"
-+     fi
-+
-+     if test -n "$qt_libraries"; then
-+       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-+     fi
-+
-+     if test -n "$x_libraries"; then
-+       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-+     fi
-+
-+     KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-+  fi
-+
-+AC_MSG_CHECKING([for KDE libraries installed])
-+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 AC_TRY_EVAL(ac_link) && test -s conftest; then
-+  AC_MSG_RESULT(yes)
-+else
-+  AC_MSG_ERROR([your system fails at linking a small KDE application!
-+Check, if your compiler is installed correctly and if you have used the
-+same compiler to compile Qt and kdelibs as you did use now.
-+For more details about this problem, look at the end of config.log.])
-+fi
-+
-+if eval `KDEDIR= ./conftest 2>&5`; then
-+  kde_result=done
-+else
-+  kde_result=problems
-+fi
-+
-+KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-+kde_have_all_paths=yes
-+
-+KDE_SET_PATHS($kde_result)
-+
-+])
-+
-+AC_DEFUN([KDE_SET_PATHS],
-+[
-+  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-+	kde_htmldir=\"$kde_htmldir\" \
-+	kde_appsdir=\"$kde_appsdir\" \
-+	kde_icondir=\"$kde_icondir\" \
-+	kde_sounddir=\"$kde_sounddir\" \
-+	kde_datadir=\"$kde_datadir\" \
-+	kde_locale=\"$kde_locale\" \
-+	kde_cgidir=\"$kde_cgidir\" \
-+	kde_confdir=\"$kde_confdir\" \
-+	kde_kcfgdir=\"$kde_kcfgdir\" \
-+	kde_mimedir=\"$kde_mimedir\" \
-+	kde_toolbardir=\"$kde_toolbardir\" \
-+	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-+	kde_templatesdir=\"$kde_templatesdir\" \
-+	kde_bindir=\"$kde_bindir\" \
-+	kde_servicesdir=\"$kde_servicesdir\" \
-+	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-+	kde_moduledir=\"$kde_moduledir\" \
-+	kde_styledir=\"$kde_styledir\" \
-+	kde_widgetdir=\"$kde_widgetdir\" \
-+	xdg_appsdir=\"$xdg_appsdir\" \
-+	xdg_menudir=\"$xdg_menudir\" \
-+	xdg_directorydir=\"$xdg_directorydir\" \
-+	kde_result=$1"
-+])
-+
-+AC_DEFUN([KDE_SET_DEFAULT_PATHS],
-+[
-+if test "$1" = "default"; then
-+
-+  if test -z "$kde_htmldir"; then
-+    kde_htmldir='\${datadir}/doc/HTML'
-+  fi
-+  if test -z "$kde_appsdir"; then
-+    kde_appsdir='\${datadir}/applnk'
-+  fi
-+  if test -z "$kde_icondir"; then
-+    kde_icondir='\${datadir}/icons'
-+  fi
-+  if test -z "$kde_sounddir"; then
-+    kde_sounddir='\${datadir}/sounds'
-+  fi
-+  if test -z "$kde_datadir"; then
-+    kde_datadir='\${datadir}/apps'
-+  fi
-+  if test -z "$kde_locale"; then
-+    kde_locale='\${datadir}/locale'
-+  fi
-+  if test -z "$kde_cgidir"; then
-+    kde_cgidir='\${exec_prefix}/cgi-bin'
-+  fi
-+  if test -z "$kde_confdir"; then
-+    kde_confdir='\${datadir}/config'
-+  fi
-+  if test -z "$kde_kcfgdir"; then
-+    kde_kcfgdir='\${datadir}/config.kcfg'
-+  fi
-+  if test -z "$kde_mimedir"; then
-+    kde_mimedir='\${datadir}/mimelnk'
-+  fi
-+  if test -z "$kde_toolbardir"; then
-+    kde_toolbardir='\${datadir}/toolbar'
-+  fi
-+  if test -z "$kde_wallpaperdir"; then
-+    kde_wallpaperdir='\${datadir}/wallpapers'
-+  fi
-+  if test -z "$kde_templatesdir"; then
-+    kde_templatesdir='\${datadir}/templates'
-+  fi
-+  if test -z "$kde_bindir"; then
-+    kde_bindir='\${exec_prefix}/bin'
-+  fi
-+  if test -z "$kde_servicesdir"; then
-+    kde_servicesdir='\${datadir}/services'
-+  fi
-+  if test -z "$kde_servicetypesdir"; then
-+    kde_servicetypesdir='\${datadir}/servicetypes'
-+  fi
-+  if test -z "$kde_moduledir"; then
-+    if test "$kde_qtver" = "2"; then
-+      kde_moduledir='\${libdir}/kde2'
-+    else
-+      kde_moduledir='\${libdir}/kde3'
-+    fi
-+  fi
-+  if test -z "$kde_styledir"; then
-+    kde_styledir='\${libdir}/kde3/plugins/styles'
-+  fi
-+  if test -z "$kde_widgetdir"; then
-+    kde_widgetdir='\${libdir}/kde3/plugins/designer'
-+  fi
-+  if test -z "$xdg_appsdir"; then
-+    xdg_appsdir='\${datadir}/applications/kde'
-+  fi
-+  if test -z "$xdg_menudir"; then
-+    xdg_menudir='\${sysconfdir}/xdg/menus'
-+  fi
-+  if test -z "$xdg_directorydir"; then
-+    xdg_directorydir='\${datadir}/desktop-directories'
-+  fi
-+
-+  KDE_SET_PATHS(defaults)
-+
-+else
-+
-+  if test $kde_qtver = 1; then
-+     AC_MSG_RESULT([compiling])
-+     KDE_1_CHECK_PATHS
-+  else
-+     AC_MSG_ERROR([path checking not yet supported for KDE 2])
-+  fi
-+
-+fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS],
-+[ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-+   test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-+   test -z "$kde_datadir" || test -z "$kde_locale"  ||
-+   test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
-+   test -z "$kde_kcfgdir" ||
-+   test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-+   test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-+   test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-+   test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-+   test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-+   test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-+   test "x$kde_have_all_paths" != "xyes"; then
-+     kde_have_all_paths=no
-+  fi
-+])
-+
-+AC_DEFUN([KDE_MISSING_PROG_ERROR],
-+[
-+    AC_MSG_ERROR([The important program $1 was not found!
-+Please check whether you installed KDE correctly.
-+])
-+])
-+
-+AC_DEFUN([KDE_MISSING_ARTS_ERROR],
-+[
-+    AC_MSG_ERROR([The important program $1 was not found!
-+Please check whether you installed aRts correctly or use
-+--without-arts to compile without aRts support (this will remove functionality).
-+])
-+])
-+
-+AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
-+[
-+    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-+    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-+    if test -n "$KDEDIRS"; then
-+       kde_save_IFS=$IFS
-+       IFS=:
-+       for dir in $KDEDIRS; do
-+            kde_default_bindirs="$dir/bin $kde_default_bindirs "
-+       done
-+       IFS=$kde_save_IFS
-+    fi
-+])
-+
-+AC_DEFUN([KDE_SUBST_PROGRAMS],
-+[
-+    AC_ARG_WITH(arts,
-+        AC_HELP_STRING([--without-arts],[build without aRts [default=no]]),
-+        [build_arts=$withval],
-+        [build_arts=yes]
-+    )
-+    AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
-+    if test "$build_arts" = "no"; then
-+        AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
-+    fi
-+
-+        KDE_SET_DEFAULT_BINDIRS
-+        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
-+        KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
-+        KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
-+        if test "$build_arts" '!=' "no"; then
-+          KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
-+          KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
-+        fi
-+        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-+
-+        kde32ornewer=1
-+        kde33ornewer=1
-+        if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
-+            kde32ornewer=
-+            kde33ornewer=
-+        else
-+            if test "$kde_qtver" = "3"; then
-+              if test "$kde_qtsubver" -le 1; then
-+                kde32ornewer=
-+              fi
-+              if test "$kde_qtsubver" -le 2; then
-+                kde33ornewer=
-+              fi
-+              if test "$KDECONFIG" != "compiled"; then
-+                if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
-+                  kde33ornewer=
-+                fi
-+              fi
-+            fi
-+        fi
-+
-+        if test -n "$kde32ornewer"; then
-+            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
-+            KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
-+        fi
-+        if test -n "$kde33ornewer"; then
-+            KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
-+            AC_SUBST(MAKEKDEWIDGETS)
-+        fi
-+        KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
-+
-+        if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
-+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-+            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
-+            AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
-+	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
-+		KDE_XSL_STYLESHEET=""
-+	    else
-+                KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl"
-+	    fi
-+        fi
-+
-+        DCOP_DEPENDENCIES='$(DCOPIDL)'
-+        if test -n "$kde32ornewer"; then
-+            KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
-+            DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
-+            AC_SUBST(KCONFIG_COMPILER)
-+            AC_SUBST(KCFG_DEPENDENCIES)
-+            AC_SUBST(DCOPIDLNG)
-+        fi
-+        AC_SUBST(DCOPIDL)
-+        AC_SUBST(DCOPIDL2CPP)
-+        AC_SUBST(DCOP_DEPENDENCIES)
-+        AC_SUBST(MCOPIDL)
-+        AC_SUBST(ARTSCCONFIG)
-+	AC_SUBST(MEINPROC)
-+ 	AC_SUBST(KDE_XSL_STYLESHEET)
-+	AC_SUBST(XMLLINT)
-+])dnl
-+
-+AC_DEFUN([AC_CREATE_KFSSTND],
-+[
-+AC_REQUIRE([AC_CHECK_RPATH])
-+
-+AC_MSG_CHECKING([for KDE paths])
-+kde_result=""
-+kde_cached_paths=yes
-+AC_CACHE_VAL(kde_cv_all_paths,
-+[
-+  KDE_SET_DEFAULT_PATHS($1)
-+  kde_cached_paths=no
-+])
-+eval "$kde_cv_all_paths"
-+KDE_CHECK_PATHS_FOR_COMPLETENESS
-+if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
-+  # wrong values were cached, may be, we can set better ones
-+  kde_result=
-+  kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
-+  kde_datadir= kde_locale=  kde_cgidir=  kde_confdir= kde_kcfgdir=
-+  kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-+  kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-+  kde_have_all_paths=
-+  kde_styledir=
-+  kde_widgetdir=
-+  xdg_appsdir = xdg_menudir= xdg_directorydir= 
-+  KDE_SET_DEFAULT_PATHS($1)
-+  eval "$kde_cv_all_paths"
-+  KDE_CHECK_PATHS_FOR_COMPLETENESS
-+  kde_result="$kde_result (cache overridden)"
-+fi
-+if test "$kde_have_all_paths" = "no"; then
-+  AC_MSG_ERROR([configure could not run a little KDE program to test the environment.
-+Since it had compiled and linked before, it must be a strange problem on your system.
-+Look at config.log for details. If you are not able to fix this, look at
-+http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-+(If you're using an egcs version on Linux, you may update binutils!)
-+])
-+else
-+  rm -f conftest*
-+  AC_MSG_RESULT($kde_result)
-+fi
-+
-+bindir=$kde_bindir
-+
-+KDE_SUBST_PROGRAMS
-+
-+])
-+
-+AC_DEFUN([AC_SUBST_KFSSTND],
-+[
-+AC_SUBST(kde_htmldir)
-+AC_SUBST(kde_appsdir)
-+AC_SUBST(kde_icondir)
-+AC_SUBST(kde_sounddir)
-+AC_SUBST(kde_datadir)
-+AC_SUBST(kde_locale)
-+AC_SUBST(kde_confdir)
-+AC_SUBST(kde_kcfgdir)
-+AC_SUBST(kde_mimedir)
-+AC_SUBST(kde_wallpaperdir)
-+AC_SUBST(kde_bindir)
-+dnl X Desktop Group standards
-+AC_SUBST(xdg_appsdir)
-+AC_SUBST(xdg_menudir)
-+AC_SUBST(xdg_directorydir)
-+dnl for KDE 2
-+AC_SUBST(kde_templatesdir)
-+AC_SUBST(kde_servicesdir)
-+AC_SUBST(kde_servicetypesdir)
-+AC_SUBST(kde_moduledir)
-+AC_SUBST(kdeinitdir, '$(kde_moduledir)')
-+AC_SUBST(kde_styledir)
-+AC_SUBST(kde_widgetdir)
-+if test "$kde_qtver" = 1; then
-+  kde_minidir="$kde_icondir/mini"
-+else
-+# for KDE 1 - this breaks KDE2 apps using minidir, but
-+# that's the plan ;-/
-+  kde_minidir="/dev/null"
-+fi
-+dnl AC_SUBST(kde_minidir)
-+dnl AC_SUBST(kde_cgidir)
-+dnl AC_SUBST(kde_toolbardir)
-+])
-+
-+AC_DEFUN([KDE_MISC_TESTS],
-+[
-+   dnl Checks for libraries.
-+   AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD 
-+   AC_SUBST(LIBUTIL)
-+   AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD
-+   AC_SUBST(LIBCOMPAT)
-+   kde_have_crypt=
-+   AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes],
-+      AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [
-+        AC_MSG_WARN([you have no crypt in either libcrypt or libc.
-+You should install libcrypt from another source or configure with PAM
-+support])
-+	kde_have_crypt=no
-+      ]))
-+   AC_SUBST(LIBCRYPT)
-+   if test $kde_have_crypt = yes; then
-+      AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
-+   fi
-+   AC_CHECK_SOCKLEN_T
-+   AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
-+   if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-+      AC_CHECK_LIB(dnet_stub, dnet_ntoa,
-+        [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
-+   fi
-+   AC_CHECK_FUNC(inet_ntoa)
-+   if test $ac_cv_func_inet_ntoa = no; then
-+     AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
-+   fi
-+   AC_CHECK_FUNC(connect)
-+   if test $ac_cv_func_connect = no; then
-+      AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
-+        $X_EXTRA_LIBS)
-+   fi
-+
-+   AC_CHECK_FUNC(remove)
-+   if test $ac_cv_func_remove = no; then
-+      AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
-+   fi
-+
-+   # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-+   AC_CHECK_FUNC(shmat, ,
-+     AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
-+   
-+   # more headers that need to be explicitly included on darwin
-+   AC_CHECK_HEADERS(sys/types.h stdint.h)
-+
-+   # sys/bitypes.h is needed for uint32_t and friends on Tru64
-+   AC_CHECK_HEADERS(sys/bitypes.h)
-+
-+   # darwin requires a poll emulation library
-+   AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
-+
-+   # for some image handling on Mac OS X
-+   AC_CHECK_HEADERS(Carbon/Carbon.h)
-+
-+   # CoreAudio framework
-+   AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
-+     AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
-+     FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
-+   ])
-+
-+   AC_CHECK_RES_INIT
-+   AC_SUBST(LIB_POLL)
-+   AC_SUBST(FRAMEWORK_COREAUDIO)
-+   LIBSOCKET="$X_EXTRA_LIBS"
-+   AC_SUBST(LIBSOCKET)
-+   AC_SUBST(X_EXTRA_LIBS)
-+   AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
-+   AC_SUBST(LIBUCB)
-+
-+   case $host in  dnl this *is* LynxOS specific
-+   *-*-lynxos* )
-+        AC_MSG_CHECKING([LynxOS header file wrappers])
-+        [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"]
-+        AC_MSG_RESULT(disabled)
-+        AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS
-+         ;;
-+    esac
-+
-+   KDE_CHECK_TYPES
-+   KDE_CHECK_LIBDL
-+   KDE_CHECK_STRLCPY
-+   KDE_CHECK_PIE_SUPPORT
-+
-+# darwin needs this to initialize the environment
-+AC_CHECK_HEADERS(crt_externs.h)
-+AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])])
-+ 
-+AH_VERBATIM(_DARWIN_ENVIRON,
-+[
-+#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-+# include <sys/time.h>
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#endif
-+])
-+
-+AH_VERBATIM(_AIX_STRINGS_H_BZERO,
-+[
-+/*
-+ * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
-+ * that defines bzero.
-+ */
-+
-+#if defined(_AIX)
-+#include <strings.h>
-+#endif
-+])
-+
-+AC_CHECK_FUNCS([vsnprintf snprintf])
-+
-+AH_VERBATIM(_TRU64,[
-+/*
-+ * On HP-UX, the declaration of vsnprintf() is needed every time !
-+ */
-+
-+#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-+#if __STDC__
-+#include <stdarg.h>
-+#include <stdlib.h>
-+#else
-+#include <varargs.h>
-+#endif
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+int snprintf(char *str, size_t n, char const *fmt, ...);
-+#endif
-+])
-+
-+])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Find the header files and libraries for X-Windows. Extended the
-+dnl macro AC_PATH_X
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([K_PATH_X],
-+[
-+AC_REQUIRE([KDE_MISC_TESTS])dnl
-+AC_REQUIRE([KDE_CHECK_LIB64])
-+
-+AC_ARG_ENABLE(
-+  embedded,
-+  AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]),
-+  kde_use_qt_emb=$enableval,
-+  kde_use_qt_emb=no
-+)
-+
-+AC_ARG_ENABLE(
-+  qtopia,
-+  AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]),
-+  kde_use_qt_emb_palm=$enableval,
-+  kde_use_qt_emb_palm=no
-+)
-+
-+AC_ARG_ENABLE(
-+  mac,
-+  AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]),
-+  kde_use_qt_mac=$enableval,
-+  kde_use_qt_mac=no
-+)
-+
-+# used to disable x11-specific stuff on special platforms
-+AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no")
-+
-+if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-+
-+AC_MSG_CHECKING(for X)
-+
-+AC_CACHE_VAL(kde_cv_have_x,
-+[# One or both of the vars are not set, and there is no cached value.
-+if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-+   kde_x_includes=NO
-+else
-+   kde_x_includes=$x_includes
-+fi
-+if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-+   kde_x_libraries=NO
-+else
-+   kde_x_libraries=$x_libraries
-+fi
-+
-+# below we use the standard autoconf calls
-+ac_x_libraries=$kde_x_libraries
-+ac_x_includes=$kde_x_includes
-+
-+KDE_PATH_X_DIRECT
-+dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries.
-+dnl Unfortunately, if compiling with the N32 ABI, this is not the correct
-+dnl location. The correct location is /usr/lib32 or an undefined value
-+dnl (the linker is smart enough to pick the correct default library).
-+dnl Things work just fine if you use just AC_PATH_X_DIRECT.
-+dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to
-+dnl /usr/openwin/include, which doesn't work. /usr/include does work, so
-+dnl x_includes should be left alone.
-+case "$host" in
-+mips-sgi-irix6*)
-+  ;;
-+*-*-solaris*)
-+  ;;
-+*)
-+  _AC_PATH_X_XMKMF
-+  if test -z "$ac_x_includes"; then
-+    ac_x_includes="."
-+  fi
-+  if test -z "$ac_x_libraries"; then
-+    ac_x_libraries="/usr/lib${kdelibsuff}"
-+  fi
-+esac
-+#from now on we use our own again
-+
-+# when the user already gave --x-includes, we ignore
-+# what the standard autoconf macros told us.
-+if test "$kde_x_includes" = NO; then
-+  kde_x_includes=$ac_x_includes
-+fi
-+
-+# for --x-libraries too
-+if test "$kde_x_libraries" = NO; then
-+  kde_x_libraries=$ac_x_libraries
-+fi
-+
-+if test "$kde_x_includes" = NO; then
-+  AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!])
-+fi
-+
-+if test "$kde_x_libraries" = NO; then
-+  AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!])
-+fi
-+
-+# Record where we found X for the cache.
-+kde_cv_have_x="have_x=yes \
-+         kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-+])dnl
-+
-+eval "$kde_cv_have_x"
-+
-+if test "$have_x" != yes; then
-+  AC_MSG_RESULT($have_x)
-+  no_x=yes
-+else
-+  AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes])
-+fi
-+
-+if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-+  X_INCLUDES=""
-+  x_includes="."; dnl better than nothing :-
-+ else
-+  x_includes=$kde_x_includes
-+  X_INCLUDES="-I$x_includes"
-+fi
-+
-+if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
-+  X_LDFLAGS=""
-+  x_libraries="/usr/lib"; dnl better than nothing :-
-+ else
-+  x_libraries=$kde_x_libraries
-+  X_LDFLAGS="-L$x_libraries"
-+fi
-+all_includes="$X_INCLUDES"
-+all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS"
-+
-+# Check for libraries that X11R6 Xt/Xaw programs need.
-+ac_save_LDFLAGS="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $X_LDFLAGS"
-+# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-+# check for ICE first), but we must link in the order -lSM -lICE or
-+# we get undefined symbols.  So assume we have SM if we have ICE.
-+# 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.
-+AC_CHECK_LIB(ICE, IceConnectionNumber,
-+  [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS)
-+LDFLAGS="$ac_save_LDFLAGS"
-+
-+LIB_X11='-lX11 $(LIBSOCKET)'
-+
-+AC_MSG_CHECKING(for libXext)
-+AC_CACHE_VAL(kde_cv_have_libXext,
-+[
-+kde_ldflags_safe="$LDFLAGS"
-+kde_libs_safe="$LIBS"
-+
-+LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-+LIBS="-lXext -lX11 $LIBSOCKET"
-+
-+AC_TRY_LINK([
-+#include <stdio.h>
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+],
-+[
-+printf("hello Xext\n");
-+],
-+kde_cv_have_libXext=yes,
-+kde_cv_have_libXext=no
-+)
-+
-+LDFLAGS=$kde_ldflags_safe
-+LIBS=$kde_libs_safe
-+])
-+
-+AC_MSG_RESULT($kde_cv_have_libXext)
-+
-+if test "$kde_cv_have_libXext" = "no"; then
-+  AC_MSG_ERROR([We need a working libXext to proceed. Since configure
-+can't find it itself, we stop here assuming that make wouldn't find
-+them either.])
-+fi
-+
-+LIB_XEXT="-lXext"
-+QTE_NORTTI=""
-+
-+elif test "$kde_use_qt_emb" = "yes"; then
-+  dnl We're using QT Embedded
-+  CPPFLAGS=-DQWS
-+  CXXFLAGS="$CXXFLAGS -fno-rtti"
-+  QTE_NORTTI="-fno-rtti -DQWS"
-+  X_PRE_LIBS=""
-+  LIB_X11=""
-+  LIB_XEXT=""
-+  LIB_XRENDER=""
-+  LIBSM=""
-+  X_INCLUDES=""
-+  X_LDFLAGS=""
-+  x_includes=""
-+  x_libraries=""
-+elif test "$kde_use_qt_mac" = "yes"; then
-+  dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
-+  dnl be included to get the information) --Sam
-+  CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
-+  CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
-+  X_PRE_LIBS=""
-+  LIB_X11=""
-+  LIB_XEXT=""
-+  LIB_XRENDER=""
-+  LIBSM=""
-+  X_INCLUDES=""
-+  X_LDFLAGS=""
-+  x_includes=""
-+  x_libraries=""
-+fi
-+AC_SUBST(X_PRE_LIBS)
-+AC_SUBST(LIB_X11)
-+AC_SUBST(LIB_XRENDER)
-+AC_SUBST(LIBSM)
-+AC_SUBST(X_INCLUDES)
-+AC_SUBST(X_LDFLAGS)
-+AC_SUBST(x_includes)
-+AC_SUBST(x_libraries)
-+AC_SUBST(QTE_NORTTI)
-+AC_SUBST(LIB_XEXT)
-+
-+])
-+
-+AC_DEFUN([KDE_PRINT_QT_PROGRAM],
-+[
-+AC_REQUIRE([KDE_USE_QT])
-+cat > conftest.$ac_ext <<EOF
-+#include "confdefs.h"
-+#include <qglobal.h>
-+#include <qapplication.h>
-+EOF
-+if test "$kde_qtver" = "2"; then
-+cat >> conftest.$ac_ext <<EOF
-+#include <qevent.h>
-+#include <qstring.h>
-+#include <qstyle.h>
-+EOF
-+
-+if test $kde_qtsubver -gt 0; then
-+cat >> conftest.$ac_ext <<EOF
-+#if QT_VERSION < 210
-+#error 1
-+#endif
-+EOF
-+fi
-+fi
-+
-+if test "$kde_qtver" = "3"; then
-+cat >> conftest.$ac_ext <<EOF
-+#include <qcursor.h>
-+#include <qstylefactory.h>
-+#include <private/qucomextra_p.h>
-+EOF
-+fi
-+
-+echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-+cat >> conftest.$ac_ext <<EOF
-+#error 1
-+#endif
-+
-+int main() {
-+EOF
-+if test "$kde_qtver" = "2"; then
-+cat >> conftest.$ac_ext <<EOF
-+    QStringList *t = new QStringList();
-+    Q_UNUSED(t);
-+EOF
-+if test $kde_qtsubver -gt 0; then
-+cat >> conftest.$ac_ext <<EOF
-+    QString s;
-+    s.setLatin1("Elvis is alive", 14);
-+EOF
-+fi
-+fi
-+if test "$kde_qtver" = "3"; then
-+cat >> conftest.$ac_ext <<EOF
-+    (void)QStyleFactory::create(QString::null);
-+    QCursor c(Qt::WhatsThisCursor);
-+EOF
-+fi
-+cat >> conftest.$ac_ext <<EOF
-+    return 0;
-+}
-+EOF
-+])
-+
-+AC_DEFUN([KDE_USE_QT],
-+[
-+if test -z "$1"; then
-+  # Current default Qt version: 3.3
-+  kde_qtver=3
-+  kde_qtsubver=3
-+else
-+  kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
-+  # following is the check if subversion isnt found in passed argument
-+  if test "$kde_qtsubver" = "$1"; then
-+    kde_qtsubver=1
-+  fi
-+  kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
-+  if test "$kde_qtver" = "1"; then
-+    kde_qtsubver=42
-+  fi
-+fi
-+
-+if test -z "$2"; then
-+  if test "$kde_qtver" = "2"; then
-+    if test $kde_qtsubver -gt 0; then
-+      kde_qt_minversion=">= Qt 2.2.2"
-+    else
-+      kde_qt_minversion=">= Qt 2.0.2"
-+    fi
-+  fi
-+  if test "$kde_qtver" = "3"; then
-+    if test $kde_qtsubver -gt 0; then
-+	 if test $kde_qtsubver -gt 1; then
-+	    if test $kde_qtsubver -gt 2; then
-+		kde_qt_minversion=">= Qt 3.3 and < 4.0"
-+	    else
-+	        kde_qt_minversion=">= Qt 3.2 and < 4.0"
-+	    fi
-+	 else
-+            kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
-+         fi
-+    else
-+      kde_qt_minversion=">= Qt 3.0 and < 4.0"
-+    fi
-+  fi
-+  if test "$kde_qtver" = "1"; then
-+    kde_qt_minversion=">= 1.42 and < 2.0"
-+  fi
-+else
-+   kde_qt_minversion="$2"
-+fi
-+
-+if test -z "$3"; then
-+   if test $kde_qtver = 3; then
-+     if test $kde_qtsubver -gt 0; then
-+       kde_qt_verstring="QT_VERSION >= 0x03 at VER@00 && QT_VERSION < 0x040000"
-+       qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
-+       kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s, at VER@,$qtsubver,"`
-+     else
-+       kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
-+     fi
-+   fi
-+   if test $kde_qtver = 2; then
-+     if test $kde_qtsubver -gt 0; then
-+       kde_qt_verstring="QT_VERSION >= 222"
-+     else
-+       kde_qt_verstring="QT_VERSION >= 200"
-+     fi
-+   fi
-+   if test $kde_qtver = 1; then
-+    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-+   fi
-+else
-+   kde_qt_verstring="$3"
-+fi
-+
-+if test $kde_qtver = 4; then
-+  kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
-+fi
-+if test $kde_qtver = 3; then
-+  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
-+fi
-+if test $kde_qtver = 2; then
-+   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-+fi
-+if test $kde_qtver = 1; then
-+   kde_qt_dirs="$QTDIR /usr/lib/qt"
-+fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_QT_DIRECT],
-+[
-+AC_REQUIRE([KDE_USE_QT])
-+AC_MSG_CHECKING([if Qt compiles without flags])
-+AC_CACHE_VAL(kde_cv_qt_direct,
-+[
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-+ac_LIBRARY_PATH="$LIBRARY_PATH"
-+ac_cxxflags_safe="$CXXFLAGS"
-+ac_ldflags_safe="$LDFLAGS"
-+ac_libs_safe="$LIBS"
-+
-+CXXFLAGS="$CXXFLAGS -I$qt_includes"
-+LDFLAGS="$LDFLAGS $X_LDFLAGS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-+else
-+LIBS="$LIBQT $LIBSOCKET"
-+fi
-+LD_LIBRARY_PATH=
-+export LD_LIBRARY_PATH
-+LIBRARY_PATH=
-+export LIBRARY_PATH
-+
-+KDE_PRINT_QT_PROGRAM
-+
-+if AC_TRY_EVAL(ac_link) && test -s conftest; then
-+  kde_cv_qt_direct="yes"
-+else
-+  kde_cv_qt_direct="no"
-+  echo "configure: failed program was:" >&AC_FD_CC
-+  cat conftest.$ac_ext >&AC_FD_CC
-+fi
-+
-+rm -f conftest*
-+CXXFLAGS="$ac_cxxflags_safe"
-+LDFLAGS="$ac_ldflags_safe"
-+LIBS="$ac_libs_safe"
-+
-+LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-+export LD_LIBRARY_PATH
-+LIBRARY_PATH="$ac_LIBRARY_PATH"
-+export LIBRARY_PATH
-+AC_LANG_RESTORE
-+])
-+
-+if test "$kde_cv_qt_direct" = "yes"; then
-+  AC_MSG_RESULT(yes)
-+  $1
-+else
-+  AC_MSG_RESULT(no)
-+  $2
-+fi
-+])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Try to find the Qt headers and libraries.
-+dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-+dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([AC_PATH_QT_1_3],
-+[
-+AC_REQUIRE([K_PATH_X])
-+AC_REQUIRE([KDE_USE_QT])
-+AC_REQUIRE([KDE_CHECK_LIB64])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Add configure flag to enable linking to MT version of Qt library.
-+dnl ------------------------------------------------------------------------
-+
-+AC_ARG_ENABLE(
-+  mt,
-+  AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
-+  kde_use_qt_mt=$enableval,
-+  [
-+    if test $kde_qtver = 3; then
-+      kde_use_qt_mt=yes
-+    else
-+      kde_use_qt_mt=no
-+    fi
-+  ]
-+)
-+
-+USING_QT_MT=""
-+
-+dnl ------------------------------------------------------------------------
-+dnl If we not get --disable-qt-mt then adjust some vars for the host.
-+dnl ------------------------------------------------------------------------
-+
-+KDE_MT_LDFLAGS=
-+KDE_MT_LIBS=
-+if test "x$kde_use_qt_mt" = "xyes"; then
-+  KDE_CHECK_THREADING
-+  if test "x$kde_use_threading" = "xyes"; then
-+    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
-+    KDE_MT_LDFLAGS="$USE_THREADS"
-+    KDE_MT_LIBS="$LIBPTHREAD"
-+  else
-+    kde_use_qt_mt=no
-+  fi
-+fi
-+AC_SUBST(KDE_MT_LDFLAGS)
-+AC_SUBST(KDE_MT_LIBS)
-+
-+kde_qt_was_given=yes
-+
-+dnl ------------------------------------------------------------------------
-+dnl If we haven't been told how to link to Qt, we work it out for ourselves.
-+dnl ------------------------------------------------------------------------
-+if test -z "$LIBQT_GLOB"; then
-+  if test "x$kde_use_qt_emb" = "xyes"; then
-+    LIBQT_GLOB="libqte.*"
-+  else
-+    LIBQT_GLOB="libqt.*"
-+  fi
-+fi
-+
-+dnl ------------------------------------------------------------
-+dnl If we got --enable-embedded then adjust the Qt library name.
-+dnl ------------------------------------------------------------
-+if test "x$kde_use_qt_emb" = "xyes"; then
-+  qtlib="qte"
-+else
-+  qtlib="qt"
-+fi
-+
-+kde_int_qt="-l$qtlib"
-+
-+if test -z "$LIBQPE"; then
-+dnl ------------------------------------------------------------
-+dnl If we got --enable-palmtop then add -lqpe to the link line
-+dnl ------------------------------------------------------------
-+  if test "x$kde_use_qt_emb" = "xyes"; then
-+    if test "x$kde_use_qt_emb_palm" = "xyes"; then
-+      LIB_QPE="-lqpe"
-+    else
-+      LIB_QPE=""
-+    fi
-+  else
-+    LIB_QPE=""
-+  fi
-+fi
-+
-+dnl ------------------------------------------------------------------------
-+dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
-+dnl ------------------------------------------------------------------------
-+
-+if test "x$kde_use_qt_mt" = "xyes"; then
-+  LIBQT="-l$qtlib-mt"
-+  kde_int_qt="-l$qtlib-mt"
-+  LIBQT_GLOB="lib$qtlib-mt.*"
-+  USING_QT_MT="using -mt"
-+else
-+  LIBQT="-l$qtlib"
-+fi
-+
-+if test $kde_qtver != 1; then
-+
-+  AC_REQUIRE([AC_FIND_PNG])
-+  AC_REQUIRE([AC_FIND_JPEG])
-+  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-+fi
-+
-+if test $kde_qtver = 3; then
-+  AC_REQUIRE([KDE_CHECK_LIBDL])
-+  LIBQT="$LIBQT $LIBDL"
-+fi
-+
-+AC_MSG_CHECKING([for Qt])
-+
-+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"
-+fi
-+ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-+qt_libraries=""
-+qt_includes=""
-+AC_ARG_WITH(qt-dir,
-+    AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
-+    [  ac_qt_includes="$withval"/include
-+       ac_qt_libraries="$withval"/lib${kdelibsuff}
-+       ac_qt_bindir="$withval"/bin
-+    ])
-+
-+AC_ARG_WITH(qt-includes,
-+    AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
-+    [
-+       ac_qt_includes="$withval"
-+    ])
-+
-+kde_qt_libs_given=no
-+
-+AC_ARG_WITH(qt-libraries,
-+    AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
-+    [  ac_qt_libraries="$withval"
-+       kde_qt_libs_given=yes
-+    ])
-+
-+AC_CACHE_VAL(ac_cv_have_qt,
-+[#try to guess Qt locations
-+
-+qt_incdirs=""
-+for dir in $kde_qt_dirs; do
-+   qt_incdirs="$qt_incdirs $dir/include $dir"
-+done
-+qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
-+if test ! "$ac_qt_includes" = "NO"; then
-+   qt_incdirs="$ac_qt_includes $qt_incdirs"
-+fi
-+
-+if test "$kde_qtver" != "1"; then
-+  kde_qt_header=qstyle.h
-+else
-+  kde_qt_header=qglobal.h
-+fi
-+
-+AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
-+ac_qt_includes="$qt_incdir"
-+
-+qt_libdirs=""
-+for dir in $kde_qt_dirs; do
-+   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
-+done
-+qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
-+if test ! "$ac_qt_libraries" = "NO"; then
-+  qt_libdir=$ac_qt_libraries
-+else
-+  qt_libdirs="$ac_qt_libraries $qt_libdirs"
-+  # if the Qt was given, the chance is too big that libqt.* doesn't exist
-+  qt_libdir=NONE
-+  for dir in $qt_libdirs; do
-+    try="ls -1 $dir/${LIBQT_GLOB}"
-+    if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-+  done
-+fi
-+for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-+  if test -e "$a"; then
-+    LIBQT="$LIBQT ${kde_int_qt}_incremental"
-+    break
-+  fi
-+done
-+
-+ac_qt_libraries="$qt_libdir"
-+
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+
-+ac_cxxflags_safe="$CXXFLAGS"
-+ac_ldflags_safe="$LDFLAGS"
-+ac_libs_safe="$LIBS"
-+
-+CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-+LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-+LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
-+
-+KDE_PRINT_QT_PROGRAM
-+
-+if AC_TRY_EVAL(ac_link) && test -s conftest; then
-+  rm -f conftest*
-+else
-+  echo "configure: failed program was:" >&AC_FD_CC
-+  cat conftest.$ac_ext >&AC_FD_CC
-+  ac_qt_libraries="NO"
-+fi
-+rm -f conftest*
-+CXXFLAGS="$ac_cxxflags_safe"
-+LDFLAGS="$ac_ldflags_safe"
-+LIBS="$ac_libs_safe"
-+
-+AC_LANG_RESTORE
-+if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
-+  ac_cv_have_qt="have_qt=no"
-+  ac_qt_notfound=""
-+  missing_qt_mt=""
-+  if test "$ac_qt_includes" = NO; then
-+    if test "$ac_qt_libraries" = NO; then
-+      ac_qt_notfound="(headers and libraries)";
-+    else
-+      ac_qt_notfound="(headers)";
-+    fi
-+  else
-+    if test "x$kde_use_qt_mt" = "xyes"; then
-+       missing_qt_mt="
-+Make sure that you have compiled Qt with thread support!"
-+       ac_qt_notfound="(library $qtlib-mt)";
-+    else
-+       ac_qt_notfound="(library $qtlib)";
-+    fi
-+  fi
-+
-+  AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-+For more details about this problem, look at the end of config.log.$missing_qt_mt])
-+else
-+  have_qt="yes"
-+fi
-+])
-+
-+eval "$ac_cv_have_qt"
-+
-+if test "$have_qt" != yes; then
-+  AC_MSG_RESULT([$have_qt]);
-+else
-+  ac_cv_have_qt="have_qt=yes \
-+    ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
-+  AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT])
-+
-+  qt_libraries="$ac_qt_libraries"
-+  qt_includes="$ac_qt_includes"
-+fi
-+
-+if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
-+     KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
-+fi
-+
-+AC_SUBST(qt_libraries)
-+AC_SUBST(qt_includes)
-+
-+if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
-+ QT_INCLUDES=""
-+else
-+ QT_INCLUDES="-I$qt_includes"
-+ all_includes="$QT_INCLUDES $all_includes"
-+fi
-+
-+if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
-+ QT_LDFLAGS=""
-+else
-+ QT_LDFLAGS="-L$qt_libraries"
-+ all_libraries="$QT_LDFLAGS $all_libraries"
-+fi
-+test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-+
-+AC_SUBST(QT_INCLUDES)
-+AC_SUBST(QT_LDFLAGS)
-+AC_PATH_QT_MOC_UIC
-+
-+KDE_CHECK_QT_JPEG
-+
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
-+else
-+LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
-+fi
-+test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
-+for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-+  if test -e "$a"; then
-+     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
-+     break
-+  fi
-+done
-+
-+AC_SUBST(LIB_QT)
-+AC_SUBST(LIB_QPE)
-+
-+AC_SUBST(kde_qtver)
-+])
-+
-+AC_DEFUN([AC_PATH_QT],
-+[
-+AC_PATH_QT_1_3
-+])
-+
-+AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
-+[
-+AC_REQUIRE([AC_PATH_QT_MOC_UIC])
-+
-+if test x$ac_uic_supports_libpath = xyes; then
-+
-+AC_MSG_CHECKING([if UIC has KDE plugins available])
-+AC_CACHE_VAL(kde_cv_uic_plugins,
-+[
-+cat > actest.ui << EOF
-+<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-+<class>NewConnectionDialog</class>
-+<widget class="QDialog">
-+   <widget class="KLineEdit">
-+        <property name="name">
-+           <cstring>testInput</cstring>
-+        </property>
-+   </widget>
-+</widget>
-+</UI>
-+EOF
-+       
-+
-+
-+kde_cv_uic_plugins=no
-+kde_line="$UIC_PATH -L $kde_widgetdir"
-+if test x$ac_uic_supports_nounload = xyes; then
-+   kde_line="$kde_line -nounload"
-+fi
-+kde_line="$kde_line -impl actest.h actest.ui > actest.cpp"
-+if AC_TRY_EVAL(kde_line); then
-+	# if you're trying to debug this check and think it's incorrect,
-+	# better check your installation. The check _is_ correct - your
-+	# installation is not.
-+	if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then
-+		kde_cv_uic_plugins=yes
-+	fi
-+fi
-+rm -f actest.ui actest.cpp
-+])
-+
-+AC_MSG_RESULT([$kde_cv_uic_plugins])
-+if test "$kde_cv_uic_plugins" != yes; then
-+	AC_MSG_ERROR([
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs. 
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
-+_same Qt version_, compiled with the _same compiler_ and the same Qt
-+configuration settings.
-+])
-+fi
-+fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_FINAL],
-+[
-+  AC_ARG_ENABLE(final,
-+	AC_HELP_STRING([--enable-final],
-+		       [build size optimized apps (experimental - needs lots of memory)]),
-+	kde_use_final=$enableval, kde_use_final=no)
-+
-+  if test "x$kde_use_final" = "xyes"; then
-+      KDE_USE_FINAL_TRUE=""
-+      KDE_USE_FINAL_FALSE="#"
-+   else
-+      KDE_USE_FINAL_TRUE="#"
-+      KDE_USE_FINAL_FALSE=""
-+  fi
-+  AC_SUBST(KDE_USE_FINAL_TRUE)
-+  AC_SUBST(KDE_USE_FINAL_FALSE)
-+])
-+
-+AC_DEFUN([KDE_CHECK_CLOSURE],
-+[
-+  AC_ARG_ENABLE(closure,
-+		AC_HELP_STRING([--enable-closure],[delay template instantiation]),
-+  	kde_use_closure=$enableval, kde_use_closure=no)
-+
-+  KDE_NO_UNDEFINED=""
-+  if test "x$kde_use_closure" = "xyes"; then
-+       KDE_USE_CLOSURE_TRUE=""
-+       KDE_USE_CLOSURE_FALSE="#"
-+#       CXXFLAGS="$CXXFLAGS $REPO"
-+  else
-+       KDE_USE_CLOSURE_TRUE="#"
-+       KDE_USE_CLOSURE_FALSE=""
-+       KDE_NO_UNDEFINED=""
-+  fi
-+  AC_SUBST(KDE_USE_CLOSURE_TRUE)
-+  AC_SUBST(KDE_USE_CLOSURE_FALSE)
-+  AC_SUBST(KDE_NO_UNDEFINED)
-+])
-+
-+dnl Check if the linker supports --enable-new-dtags and --as-needed
-+AC_DEFUN([KDE_CHECK_NEW_LDFLAGS],
-+[
-+  AC_ARG_ENABLE(new_ldflags,
-+		AC_HELP_STRING([--enable-new-ldflags],
-+		[enable the new linker flags]),
-+	kde_use_new_ldflags=$enableval, 
-+	kde_use_new_ldflags=no)
-+
-+  LDFLAGS_AS_NEEDED=""
-+  LDFLAGS_NEW_DTAGS=""
-+  if test "x$kde_use_new_ldflags" = "xyes"; then
-+       LDFLAGS_NEW_DTAGS=""
-+       KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags],
-+		[LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],)
-+
-+       KDE_CHECK_COMPILER_FLAG([Wl,--as-needed],
-+		[LDFLAGS_AS_NEEDED="-Wl,--as-needed"],)
-+  fi
-+  AC_SUBST(LDFLAGS_AS_NEEDED)
-+  AC_SUBST(LDFLAGS_NEW_DTAGS)
-+])
-+
-+AC_DEFUN([KDE_CHECK_NMCHECK],
-+[
-+  AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]),
-+	kde_use_nmcheck=$enableval, kde_use_nmcheck=no)
-+
-+  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
-+  AC_SUBST(KDE_USE_NMCHECK_TRUE)
-+  AC_SUBST(KDE_USE_NMCHECK_FALSE)
-+])
-+
-+AC_DEFUN([KDE_EXPAND_MAKEVAR], [
-+savex=$exec_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+tmp=$$2
-+while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done
-+exec_prefix=$savex
-+])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Now, the same with KDE
-+dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed)
-+dnl and $(kde_includes) will be the kdehdrlocation (if needed)
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([AC_BASE_PATH_KDE],
-+[
-+AC_REQUIRE([KDE_CHECK_STL])
-+AC_REQUIRE([AC_PATH_QT])dnl
-+AC_REQUIRE([KDE_CHECK_LIB64])
-+
-+AC_CHECK_RPATH
-+AC_MSG_CHECKING([for KDE])
-+
-+if test "${prefix}" != NONE; then
-+  kde_includes=${includedir}
-+  KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
-+
-+  kde_libraries=${libdir}
-+  KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
-+
-+else
-+  ac_kde_includes=
-+  ac_kde_libraries=
-+  kde_libraries=""
-+  kde_includes=""
-+fi
-+
-+AC_CACHE_VAL(ac_cv_have_kde,
-+[#try to guess kde locations
-+
-+if test "$kde_qtver" = 1; then
-+  kde_check_header="ksock.h"
-+  kde_check_lib="libkdecore.la"
-+else
-+  kde_check_header="ksharedptr.h"
-+  kde_check_lib="libkio.la"
-+fi
-+
-+if test -z "$1"; then
-+
-+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-+test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
-+kde_incdirs="$ac_kde_includes $kde_incdirs"
-+AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
-+ac_kde_includes="$kde_incdir"
-+
-+if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
-+  AC_MSG_ERROR([
-+in the prefix, you've chosen, are no KDE headers installed. This will fail.
-+So, check this please and use another prefix!])
-+fi
-+
-+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-+test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
-+kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
-+AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-+ac_kde_libraries="$kde_libdir"
-+
-+kde_widgetdir=NO
-+dnl this might be somewhere else
-+AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
-+
-+if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-+AC_MSG_ERROR([
-+in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-+So, check this please and use another prefix!])
-+fi
-+
-+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-+AC_MSG_ERROR([
-+I can't find the designer plugins. These are required and should have been installed
-+by kdelibs])
-+fi
-+
-+if test -n "$kde_widgetdir"; then
-+    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
-+fi
-+
-+
-+if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then
-+  ac_cv_have_kde="have_kde=no"
-+else
-+  ac_cv_have_kde="have_kde=yes \
-+    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-+fi
-+
-+else dnl test -z $1, e.g. from kdelibs
-+
-+  ac_cv_have_kde="have_kde=no"
-+
-+fi
-+])dnl
-+
-+eval "$ac_cv_have_kde"
-+
-+if test "$have_kde" != "yes"; then
-+ if test "${prefix}" = NONE; then
-+  ac_kde_prefix="$ac_default_prefix"
-+ else
-+  ac_kde_prefix="$prefix"
-+ fi
-+ if test "$exec_prefix" = NONE; then
-+  ac_kde_exec_prefix="$ac_kde_prefix"
-+  AC_MSG_RESULT([will be installed in $ac_kde_prefix])
-+ else
-+  ac_kde_exec_prefix="$exec_prefix"
-+  AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
-+ fi
-+
-+ kde_libraries="${libdir}"
-+ kde_includes="${includedir}"
-+
-+else
-+  ac_cv_have_kde="have_kde=yes \
-+    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-+  AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes])
-+
-+  kde_libraries="$ac_kde_libraries"
-+  kde_includes="$ac_kde_includes"
-+fi
-+AC_SUBST(kde_libraries)
-+AC_SUBST(kde_includes)
-+
-+if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes"  || test "$kde_includes" = "/usr/include"; then
-+ KDE_INCLUDES=""
-+else
-+ KDE_INCLUDES="-I$kde_includes"
-+ all_includes="$KDE_INCLUDES $all_includes"
-+fi
-+
-+KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
-+ 
-+KDE_LDFLAGS="-L$kde_libraries"
-+if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then 
-+ all_libraries="$KDE_LDFLAGS $all_libraries"
-+fi
-+
-+AC_SUBST(KDE_LDFLAGS)
-+AC_SUBST(KDE_INCLUDES)
-+
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+
-+all_libraries="$all_libraries $USER_LDFLAGS"
-+all_includes="$all_includes $USER_INCLUDES"
-+AC_SUBST(all_includes)
-+AC_SUBST(all_libraries)
-+
-+if test -z "$1"; then
-+KDE_CHECK_UIC_PLUGINS
-+fi
-+
-+ac_kde_libraries="$kde_libdir"
-+
-+AC_SUBST(AUTODIRS)
-+
-+
-+])
-+
-+AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
-+[
-+AC_MSG_CHECKING(for extra includes)
-+AC_ARG_WITH(extra-includes,AC_HELP_STRING([--with-extra-includes=DIR],[adds non standard include paths]),
-+  kde_use_extra_includes="$withval",
-+  kde_use_extra_includes=NONE
-+)
-+kde_extra_includes=
-+if test -n "$kde_use_extra_includes" && \
-+   test "$kde_use_extra_includes" != "NONE"; then
-+
-+   ac_save_ifs=$IFS
-+   IFS=':'
-+   for dir in $kde_use_extra_includes; do
-+     kde_extra_includes="$kde_extra_includes $dir"
-+     USER_INCLUDES="$USER_INCLUDES -I$dir"
-+   done
-+   IFS=$ac_save_ifs
-+   kde_use_extra_includes="added"
-+else
-+   kde_use_extra_includes="no"
-+fi
-+AC_SUBST(USER_INCLUDES)
-+
-+AC_MSG_RESULT($kde_use_extra_includes)
-+
-+kde_extra_libs=
-+AC_MSG_CHECKING(for extra libs)
-+AC_ARG_WITH(extra-libs,AC_HELP_STRING([--with-extra-libs=DIR],[adds non standard library paths]),
-+  kde_use_extra_libs=$withval,
-+  kde_use_extra_libs=NONE
-+)
-+if test -n "$kde_use_extra_libs" && \
-+   test "$kde_use_extra_libs" != "NONE"; then
-+
-+   ac_save_ifs=$IFS
-+   IFS=':'
-+   for dir in $kde_use_extra_libs; do
-+     kde_extra_libs="$kde_extra_libs $dir"
-+     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
-+     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
-+   done
-+   IFS=$ac_save_ifs
-+   kde_use_extra_libs="added"
-+else
-+   kde_use_extra_libs="no"
-+fi
-+
-+AC_SUBST(USER_LDFLAGS)
-+
-+AC_MSG_RESULT($kde_use_extra_libs)
-+
-+])
-+
-+AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
-+[
-+    AC_MSG_CHECKING([for KDE headers installed])
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+cat > conftest.$ac_ext <<EOF
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+#include <stdio.h>
-+#include "confdefs.h"
-+#include <kapp.h>
-+
-+int main() {
-+    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-+    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-+    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-+    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-+    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-+    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-+    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-+    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-+    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-+    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-+    printf("kde_wallpaperdir=\\"%s\\"\n",
-+	KApplication::kde_wallpaperdir().data());
-+    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-+    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-+    printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-+    printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-+    printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-+    printf("kde_styledir=\\"/tmp/dummy\\"\n");
-+    printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-+    printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-+    printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-+    printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-+    printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-+    return 0;
-+    }
-+EOF
-+
-+ ac_save_CPPFLAGS=$CPPFLAGS
-+ CPPFLAGS="$all_includes $CPPFLAGS"
-+ if AC_TRY_EVAL(ac_compile); then
-+   AC_MSG_RESULT(yes)
-+ else
-+   AC_MSG_ERROR([your system is not able to compile a small KDE application!
-+Check, if you installed the KDE header files correctly.
-+For more details about this problem, look at the end of config.log.])
-+  fi
-+  CPPFLAGS=$ac_save_CPPFLAGS
-+
-+  AC_LANG_RESTORE
-+])
-+
-+AC_DEFUN([KDE_CHECK_KDEQTADDON],
-+[
-+AC_MSG_CHECKING(for kde-qt-addon)
-+AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
-+[
-+ kde_ldflags_safe="$LDFLAGS"
-+ kde_libs_safe="$LIBS"
-+ kde_cxxflags_safe="$CXXFLAGS"
-+
-+ LIBS="-lkde-qt-addon $LIBQT $LIBS"
-+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
-+ LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
-+
-+ AC_TRY_LINK([
-+   #include <qdom.h>
-+ ],
-+ [
-+   QDomDocument doc;
-+ ],
-+  kde_cv_have_kdeqtaddon=yes,
-+  kde_cv_have_kdeqtaddon=no
-+ )
-+
-+ LDFLAGS=$kde_ldflags_safe
-+ LIBS=$kde_libs_safe
-+ CXXFLAGS=$kde_cxxflags_safe
-+])
-+
-+AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
-+
-+if test "$kde_cv_have_kdeqtaddon" = "no"; then
-+  AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
-+It is a separate package (and CVS module) named kde-qt-addon.])
-+fi
-+])
-+
-+AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
-+[
-+   AC_REQUIRE([KDE_MISC_TESTS])
-+   AC_REQUIRE([KDE_CHECK_LIBDL])
-+   AC_REQUIRE([K_PATH_X])
-+
-+if test $kde_qtver = 3; then
-+   case $host in 
-+               *cygwin*) lib_kded="-lkdeinit_kded" ;;
-+               *) lib_kded="" ;;
-+       esac
-+   AC_SUBST(LIB_KDED, $lib_kded)
-+   AC_SUBST(LIB_KDECORE, "-lkdecore")
-+   AC_SUBST(LIB_KDEUI, "-lkdeui")
-+   AC_SUBST(LIB_KIO, "-lkio")
-+   AC_SUBST(LIB_KJS, "-lkjs")
-+   AC_SUBST(LIB_SMB, "-lsmb")
-+   AC_SUBST(LIB_KAB, "-lkab")
-+   AC_SUBST(LIB_KABC, "-lkabc")
-+   AC_SUBST(LIB_KHTML, "-lkhtml")
-+   AC_SUBST(LIB_KSPELL, "-lkspell")
-+   AC_SUBST(LIB_KPARTS, "-lkparts")
-+   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-+   AC_SUBST(LIB_KUTILS, "-lkutils")
-+   AC_SUBST(LIB_KDEPIM, "-lkdepim")
-+   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
-+   AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-+   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-+   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
-+# these are for backward compatibility
-+   AC_SUBST(LIB_KSYCOCA, "-lkio")
-+   AC_SUBST(LIB_KFILE, "-lkio")
-+elif test $kde_qtver = 2; then
-+   AC_SUBST(LIB_KDECORE, "-lkdecore")
-+   AC_SUBST(LIB_KDEUI, "-lkdeui")
-+   AC_SUBST(LIB_KIO, "-lkio")
-+   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
-+   AC_SUBST(LIB_SMB, "-lsmb")
-+   AC_SUBST(LIB_KFILE, "-lkfile")
-+   AC_SUBST(LIB_KAB, "-lkab")
-+   AC_SUBST(LIB_KHTML, "-lkhtml")
-+   AC_SUBST(LIB_KSPELL, "-lkspell")
-+   AC_SUBST(LIB_KPARTS, "-lkparts")
-+   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-+else
-+   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
-+   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
-+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-+   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
-+fi
-+])
-+
-+AC_DEFUN([AC_PATH_KDE],
-+[
-+  AC_BASE_PATH_KDE
-+  AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]),
-+  [
-+  if test "$enableval" = "no";
-+    then ac_use_path_checking="default"
-+    else ac_use_path_checking=""
-+  fi
-+  ],
-+  [
-+  if test "$kde_qtver" = 1;
-+    then ac_use_path_checking=""
-+    else ac_use_path_checking="default"
-+  fi
-+  ]
-+  )
-+
-+  AC_CREATE_KFSSTND($ac_use_path_checking)
-+
-+  AC_SUBST_KFSSTND
-+  KDE_CREATE_LIBS_ALIASES
-+])
-+
-+dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found])
-+AC_DEFUN([KDE_CHECK_FUNC_EXT],
-+[
-+AC_MSG_CHECKING(for $1)
-+AC_CACHE_VAL(kde_cv_func_$1,
-+[
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+AC_TRY_COMPILE([
-+$2
-+],
-+[
-+$3
-+],
-+kde_cv_func_$1=yes,
-+kde_cv_func_$1=no)
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+AC_LANG_RESTORE
-+])
-+
-+AC_MSG_RESULT($kde_cv_func_$1)
-+
-+AC_MSG_CHECKING([if $1 needs custom prototype])
-+AC_CACHE_VAL(kde_cv_proto_$1,
-+[
-+if test "x$kde_cv_func_$1" = xyes; then
-+  kde_cv_proto_$1=no
-+else
-+  case "$1" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_$1="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_$1=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_$1" = xunknown; then
-+
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  AC_TRY_LINK([
-+$2
-+
-+extern "C" $4;
-+],
-+[
-+$3
-+],
-+[ kde_cv_func_$1=yes
-+  kde_cv_proto_$1=yes ],
-+  [kde_cv_proto_$1="$1 unavailable"]
-+)
-+LIBS=$kde_safe_libs
-+AC_LANG_RESTORE
-+fi
-+])
-+AC_MSG_RESULT($kde_cv_proto_$1)
-+
-+if test "x$kde_cv_func_$1" = xyes; then
-+  AC_DEFINE(HAVE_$5, 1, [Define if you have $1])
-+  $6
-+fi
-+if test "x$kde_cv_proto_$1" = xno; then
-+  AC_DEFINE(HAVE_$5_PROTO, 1,
-+  [Define if you have the $1 prototype])
-+fi
-+
-+AH_VERBATIM([_HAVE_$5_PROTO],
-+[
-+#if !defined(HAVE_$5_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+$4;
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+])
-+])
-+
-+AC_DEFUN([AC_CHECK_SETENV],
-+[
-+	KDE_CHECK_FUNC_EXT(setenv, [
-+#include <stdlib.h>
-+], 
-+		[setenv("VAR", "VALUE", 1);],
-+	        [int setenv (const char *, const char *, int)],
-+		[SETENV])
-+])
-+
-+AC_DEFUN([AC_CHECK_UNSETENV],
-+[
-+	KDE_CHECK_FUNC_EXT(unsetenv, [
-+#include <stdlib.h>
-+], 
-+		[unsetenv("VAR");],
-+	        [void unsetenv (const char *)],
-+		[UNSETENV])
-+])
-+
-+AC_DEFUN([AC_CHECK_GETDOMAINNAME],
-+[
-+	KDE_CHECK_FUNC_EXT(getdomainname, [
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netdb.h>
-+], 
-+		[
-+char buffer[200];
-+getdomainname(buffer, 200);
-+], 	
-+	        [#include <sys/types.h>
-+		int getdomainname (char *, size_t)],
-+		[GETDOMAINNAME])
-+])
-+
-+AC_DEFUN([AC_CHECK_GETHOSTNAME],
-+[
-+	KDE_CHECK_FUNC_EXT(gethostname, [
-+#include <stdlib.h>
-+#include <unistd.h>
-+], 
-+		[
-+char buffer[200];
-+gethostname(buffer, 200);
-+], 	
-+	        [int gethostname (char *, unsigned int)],
-+		[GETHOSTNAME])
-+])
-+
-+AC_DEFUN([AC_CHECK_USLEEP],
-+[
-+	KDE_CHECK_FUNC_EXT(usleep, [
-+#include <unistd.h>
-+], 
-+		[
-+usleep(200);
-+], 	
-+	        [int usleep (unsigned int)],
-+		[USLEEP])
-+])
-+
-+
-+AC_DEFUN([AC_CHECK_RANDOM],
-+[
-+	KDE_CHECK_FUNC_EXT(random, [
-+#include <stdlib.h>
-+], 
-+		[
-+random();
-+], 	
-+	        [long int random(void)],
-+		[RANDOM])
-+
-+	KDE_CHECK_FUNC_EXT(srandom, [
-+#include <stdlib.h>
-+], 
-+		[
-+srandom(27);
-+], 	
-+	        [void srandom(unsigned int)],
-+		[SRANDOM])
-+
-+])
-+
-+AC_DEFUN([AC_CHECK_INITGROUPS],
-+[
-+	KDE_CHECK_FUNC_EXT(initgroups, [
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <grp.h>
-+],
-+	[
-+char buffer[200];
-+initgroups(buffer, 27);
-+],
-+	[int initgroups(const char *, gid_t)],
-+	[INITGROUPS])
-+])
-+
-+AC_DEFUN([AC_CHECK_MKSTEMPS],
-+[
-+	KDE_CHECK_FUNC_EXT(mkstemps, [
-+#include <stdlib.h>
-+#include <unistd.h>
-+],
-+	[
-+mkstemps("/tmp/aaaXXXXXX", 6);
-+],
-+	[int mkstemps(char *, int)],
-+	[MKSTEMPS])
-+])
-+
-+AC_DEFUN([AC_CHECK_MKSTEMP],
-+[
-+	KDE_CHECK_FUNC_EXT(mkstemp, [
-+#include <stdlib.h>
-+#include <unistd.h>
-+],
-+	[
-+mkstemp("/tmp/aaaXXXXXX");
-+],
-+	[int mkstemp(char *)],
-+	[MKSTEMP])
-+])
-+
-+AC_DEFUN([AC_CHECK_MKDTEMP],
-+[
-+	KDE_CHECK_FUNC_EXT(mkdtemp, [
-+#include <stdlib.h>
-+#include <unistd.h>
-+],
-+	[
-+mkdtemp("/tmp/aaaXXXXXX");
-+],
-+	[char *mkdtemp(char *)],
-+	[MKDTEMP])
-+])
-+
-+
-+AC_DEFUN([AC_CHECK_RES_INIT],
-+[
-+  AC_MSG_CHECKING([if res_init needs -lresolv])
-+  kde_libs_safe="$LIBS"
-+  LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-+  AC_TRY_LINK(
-+    [
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+    ],
-+    [
-+      res_init(); 
-+    ],
-+    [
-+      LIBRESOLV="-lresolv"
-+      AC_MSG_RESULT(yes)
-+      AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-+    ],
-+    [ AC_MSG_RESULT(no) ]
-+  )
-+  LIBS=$kde_libs_safe
-+  AC_SUBST(LIBRESOLV)
-+
-+  KDE_CHECK_FUNC_EXT(res_init,
-+    [
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+    ],
-+    [res_init()],
-+    [int res_init(void)],
-+    [RES_INIT])
-+])
-+
-+AC_DEFUN([AC_CHECK_STRLCPY],
-+[
-+	KDE_CHECK_FUNC_EXT(strlcpy, [
-+#include <string.h>
-+],
-+[ char buf[20];
-+  strlcpy(buf, "KDE function test", sizeof(buf));
-+],
-+ 	[unsigned long strlcpy(char*, const char*, unsigned long)],
-+	[STRLCPY])
-+])
-+
-+AC_DEFUN([AC_CHECK_STRLCAT],
-+[
-+	KDE_CHECK_FUNC_EXT(strlcat, [
-+#include <string.h>
-+],
-+[ char buf[20];
-+  buf[0]='\0';
-+  strlcat(buf, "KDE function test", sizeof(buf));
-+],
-+ 	[unsigned long strlcat(char*, const char*, unsigned long)],
-+	[STRLCAT])
-+])
-+
-+AC_DEFUN([AC_CHECK_RES_QUERY],
-+[
-+	KDE_CHECK_FUNC_EXT(res_query, [
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+#include <netdb.h>
-+],
-+[
-+res_query(NULL, 0, 0, NULL, 0);
-+],
-+	[int res_query(const char *, int, int, unsigned char *, int)],
-+	[RES_QUERY])
-+])
-+
-+AC_DEFUN([AC_CHECK_DN_SKIPNAME],
-+[
-+	KDE_CHECK_FUNC_EXT(dn_skipname, [
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+],
-+[
-+dn_skipname (NULL, NULL);
-+],
-+	[int dn_skipname (unsigned char *, unsigned char *)],
-+	[DN_SKIPNAME])
-+])
-+
-+
-+AC_DEFUN([AC_FIND_GIF],
-+   [AC_MSG_CHECKING([for giflib])
-+AC_CACHE_VAL(ac_cv_lib_gif,
-+[ac_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
-+else
-+LIBS="$all_libraries -lgif"
-+fi
-+AC_TRY_LINK(dnl
-+[
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+int GifLastError(void);
-+#ifdef __cplusplus
-+}
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+],
-+            [return GifLastError();],
-+            eval "ac_cv_lib_gif=yes",
-+            eval "ac_cv_lib_gif=no")
-+LIBS="$ac_save_LIBS"
-+])dnl
-+if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
-+  AC_MSG_RESULT(yes)
-+  AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
-+else
-+  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
-+fi
-+])
-+
-+AC_DEFUN([KDE_FIND_JPEG_HELPER],
-+[
-+AC_MSG_CHECKING([for libjpeg$2])
-+AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
-+[
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+AC_TRY_LINK(
-+[
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+void jpeg_CreateDecompress();
-+#ifdef __cplusplus
-+}
-+#endif
-+],
-+[jpeg_CreateDecompress();],
-+            eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
-+            eval "ac_cv_lib_jpeg_$1=no")
-+LIBS="$ac_save_LIBS"
-+CFLAGS="$ac_save_CFLAGS"
-+])
-+
-+if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then
-+  LIBJPEG="$ac_cv_lib_jpeg_$1"
-+  AC_MSG_RESULT($ac_cv_lib_jpeg_$1)
-+else
-+  AC_MSG_RESULT(no)
-+  $3
-+fi
-+
-+])
-+
-+AC_DEFUN([AC_FIND_JPEG],
-+[
-+dnl first look for libraries
-+KDE_FIND_JPEG_HELPER(6b, 6b,
-+   KDE_FIND_JPEG_HELPER(normal, [],
-+    [
-+       LIBJPEG=
-+    ]
-+   )
-+)
-+
-+dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
-+dnl requires system dependent includes loaded before it)
-+jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-+AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
-+test "x$jpeg_incdir" = xNO && jpeg_incdir=
-+
-+dnl if headers _and_ libraries are missing, this is no error, and we
-+dnl continue with a warning (the user will get no jpeg support in khtml)
-+dnl if only one is missing, it means a configuration error, but we still
-+dnl only warn
-+if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-+  AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
-+else
-+  if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-+    AC_MSG_WARN([
-+There is an installation error in jpeg support. You seem to have only one
-+of either the headers _or_ the libraries installed. You may need to either
-+provide correct --with-extra-... options, or the development package of
-+libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-+Disabling JPEG support.
-+])
-+  else
-+    AC_MSG_WARN([libjpeg not found. disable JPEG support.])
-+  fi
-+  jpeg_incdir=
-+  LIBJPEG=
-+fi
-+
-+AC_SUBST(LIBJPEG)
-+AH_VERBATIM(_AC_CHECK_JPEG,
-+[/*
-+ * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
-+ * headers and I'm too lazy to write a configure test as long as only
-+ * unixware is related
-+ */
-+#ifdef _UNIXWARE
-+#define HAVE_BOOLEAN
-+#endif
-+])
-+])
-+
-+AC_DEFUN([KDE_CHECK_QT_JPEG],
-+[
-+if test -n "$LIBJPEG"; then
-+AC_MSG_CHECKING([if Qt needs $LIBJPEG])
-+AC_CACHE_VAL(kde_cv_qt_jpeg,
-+[
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
-+LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
-+ac_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+AC_TRY_LINK(
-+[#include <qapplication.h>],
-+            [
-+            int argc;
-+            char** argv;
-+            QApplication app(argc, argv);],
-+            eval "kde_cv_qt_jpeg=no",
-+            eval "kde_cv_qt_jpeg=yes")
-+LIBS="$ac_save_LIBS"
-+CXXFLAGS="$ac_save_CXXFLAGS"
-+AC_LANG_RESTORE
-+fi
-+])
-+
-+if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
-+  AC_MSG_RESULT(yes)
-+  LIBJPEG_QT='$(LIBJPEG)'
-+else
-+  AC_MSG_RESULT(no)
-+  LIBJPEG_QT=
-+fi
-+
-+])
-+
-+AC_DEFUN([AC_FIND_ZLIB],
-+[
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+AC_MSG_CHECKING([for libz])
-+AC_CACHE_VAL(ac_cv_lib_z,
-+[
-+kde_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
-+kde_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+AC_TRY_LINK(dnl
-+[
-+#include<zlib.h>
-+],
-+[
-+  char buf[42];
-+  gzFile f = (gzFile) 0;
-+  /* this would segfault.. but we only link, don't run */
-+  (void) gzgets(f, buf, sizeof(buf));
-+
-+  return (zlibVersion() == ZLIB_VERSION); 
-+],
-+            eval "ac_cv_lib_z='-lz'",
-+            eval "ac_cv_lib_z=no")
-+LIBS="$kde_save_LIBS"
-+CFLAGS="$kde_save_CFLAGS"
-+])dnl
-+if test ! "$ac_cv_lib_z" = no; then
-+  AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
-+  LIBZ="$ac_cv_lib_z"
-+  AC_MSG_RESULT($ac_cv_lib_z)
-+else
-+  AC_MSG_ERROR(not found. 
-+          Possibly configure picks up an outdated version
-+          installed by XFree86. Remove it from your system.
-+
-+          Check your installation and look into config.log)
-+  LIBZ=""
-+fi
-+AC_SUBST(LIBZ)
-+])
-+
-+AC_DEFUN([KDE_TRY_TIFFLIB],
-+[
-+AC_MSG_CHECKING([for libtiff $1])
-+
-+AC_CACHE_VAL(kde_cv_libtiff_$1,
-+[
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+kde_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-+else
-+LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm"
-+fi
-+kde_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+
-+AC_TRY_LINK(dnl
-+[
-+#include<tiffio.h>
-+],
-+    [return (TIFFOpen( "", "r") == 0); ],
-+[
-+    kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
-+], [
-+    kde_cv_libtiff_$1=no
-+])
-+
-+LIBS="$kde_save_LIBS"
-+CXXFLAGS="$kde_save_CXXFLAGS"
-+AC_LANG_RESTORE
-+])
-+
-+if test "$kde_cv_libtiff_$1" = "no"; then
-+    AC_MSG_RESULT(no)
-+    LIBTIFF=""
-+    $3
-+else
-+    LIBTIFF="$kde_cv_libtiff_$1"
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff])
-+    $2
-+fi
-+
-+])
-+
-+AC_DEFUN([AC_FIND_TIFF],
-+[
-+AC_REQUIRE([K_PATH_X])
-+AC_REQUIRE([AC_FIND_ZLIB])
-+AC_REQUIRE([AC_FIND_JPEG])
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+
-+KDE_TRY_TIFFLIB(tiff, [],
-+   KDE_TRY_TIFFLIB(tiff34))
-+
-+AC_SUBST(LIBTIFF)
-+])
-+
-+AC_DEFUN([KDE_FIND_LIBEXR],
-+[
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+AC_REQUIRE([AC_FIND_ZLIB])
-+AC_CACHE_VAL(ac_cv_libexr,
-+[
-+  if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+  fi
-+
-+  AC_MSG_CHECKING([for OpenEXR libraries])
-+
-+  if test "$PKG_CONFIG" = "no" ; then
-+     AC_MSG_RESULT(no)
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+  else
-+     if !(`$PKG_CONFIG --exists OpenEXR`) ; then
-+        AC_MSG_RESULT(no)
-+        EXRSTATUS=no
-+     else
-+        if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
-+           AC_MSG_RESULT(no)
-+           EXRSTATUS=old
-+        else
-+           kde_save_LIBS="$LIBS"
-+           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
-+           AC_LANG_SAVE
-+           AC_LANG_CPLUSPLUS
-+           kde_save_CXXFLAGS="$CXXFLAGS"
-+           EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
-+           CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
-+
-+           AC_TRY_LINK(dnl
-+               [
-+               #include <ImfRgbaFile.h>
-+               ],
-+               [
-+               using namespace Imf;
-+               RgbaInputFile file ("dummy");
-+               return 0;
-+               ],
-+               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
-+               eval "ac_cv_libexr=no"
-+           )
-+           LIBS="$kde_save_LIBS"
-+           CXXFLAGS="$kde_save_CXXFLAGS"
-+           AC_LANG_RESTORE
-+           ])dnl
-+           if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
-+               AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
-+               LIB_EXR="$ac_cv_libexr"
-+               AC_MSG_RESULT($ac_cv_libexr)
-+           else
-+               AC_MSG_RESULT(no)
-+               LIB_EXR=""
-+           fi
-+        fi
-+     fi
-+  fi
-+  AC_SUBST(LIB_EXR)
-+  AC_SUBST(EXR_FLAGS)
-+])
-+
-+
-+
-+AC_DEFUN([AC_FIND_PNG],
-+[
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+AC_REQUIRE([AC_FIND_ZLIB])
-+AC_MSG_CHECKING([for libpng])
-+AC_CACHE_VAL(ac_cv_lib_png,
-+[
-+kde_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-+else
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-+fi
-+kde_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+
-+AC_TRY_LINK(dnl
-+    [
-+    #include<png.h>
-+    ],
-+    [
-+    png_structp png_ptr = png_create_read_struct(  /* image ptr */
-+		PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-+    return( png_ptr != 0 );
-+    ],
-+    eval "ac_cv_lib_png='-lpng $LIBZ -lm'",
-+    eval "ac_cv_lib_png=no"
-+)
-+LIBS="$kde_save_LIBS"
-+CFLAGS="$kde_save_CFLAGS"
-+])dnl
-+if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-+  AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
-+  LIBPNG="$ac_cv_lib_png"
-+  AC_SUBST(LIBPNG)
-+  AC_MSG_RESULT($ac_cv_lib_png)
-+else
-+  AC_MSG_RESULT(no)
-+  LIBPNG=""
-+  AC_SUBST(LIBPNG)
-+fi
-+])
-+
-+
-+AC_DEFUN([AC_FIND_JASPER],
-+[
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+AC_REQUIRE([AC_FIND_JPEG])
-+AC_MSG_CHECKING([for jasper])
-+AC_CACHE_VAL(ac_cv_jasper,
-+[
-+kde_save_LIBS="$LIBS"
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
-+kde_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+
-+AC_TRY_LINK(dnl
-+    [
-+    #include<jasper/jasper.h>
-+    ],
-+    [
-+    return( jas_init() );
-+    ],
-+    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
-+    eval "ac_cv_jasper=no"
-+)
-+LIBS="$kde_save_LIBS"
-+CFLAGS="$kde_save_CFLAGS"
-+])dnl
-+if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then
-+  AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper])
-+  LIB_JASPER="$ac_cv_jasper"
-+  AC_MSG_RESULT($ac_cv_jasper)
-+else
-+  AC_MSG_RESULT(no)
-+  LIB_JASPER=""
-+fi
-+AC_SUBST(LIB_JASPER)
-+])
-+
-+AC_DEFUN([AC_CHECK_BOOL],
-+[
-+  AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
-+])
-+
-+AC_DEFUN([AC_CHECK_GNU_EXTENSIONS],
-+[
-+AC_MSG_CHECKING(if you need GNU extensions)
-+AC_CACHE_VAL(ac_cv_gnu_extensions,
-+[
-+cat > conftest.c << EOF
-+#include <features.h>
-+
-+#ifdef __GNU_LIBRARY__
-+yes
-+#endif
-+EOF
-+
-+if (eval "$ac_cpp conftest.c") 2>&5 |
-+  egrep "yes" >/dev/null 2>&1; then
-+  rm -rf conftest*
-+  ac_cv_gnu_extensions=yes
-+else
-+  ac_cv_gnu_extensions=no
-+fi
-+])
-+
-+AC_MSG_RESULT($ac_cv_gnu_extensions)
-+if test "$ac_cv_gnu_extensions" = "yes"; then
-+  AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions])
-+fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_COMPILER_FLAG],
-+[
-+AC_MSG_CHECKING([whether $CXX supports -$1])
-+kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
-+AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
-+[
-+  AC_LANG_SAVE
-+  AC_LANG_CPLUSPLUS
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -$1"
-+  AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], [])
-+  CXXFLAGS="$save_CXXFLAGS"
-+  AC_LANG_RESTORE
-+])
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-+ AC_MSG_RESULT(yes)
-+ :
-+ $2
-+else
-+ AC_MSG_RESULT(no)
-+ :
-+ $3
-+fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_C_COMPILER_FLAG],
-+[
-+AC_MSG_CHECKING([whether $CC supports -$1])
-+kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
-+AC_CACHE_VAL(kde_cv_prog_cc_$kde_cache,
-+[
-+  AC_LANG_SAVE
-+  AC_LANG_C
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -$1"
-+  AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cc_$kde_cache=yes"], [])
-+  CFLAGS="$save_CFLAGS"
-+  AC_LANG_RESTORE
-+])
-+if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
-+ AC_MSG_RESULT(yes)
-+ :
-+ $2
-+else
-+ AC_MSG_RESULT(no)
-+ :
-+ $3
-+fi
-+])
-+
-+
-+dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables
-+dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever])
-+dnl it's all white-space separated
-+AC_DEFUN([AC_REMOVE_FORBIDDEN],
-+[ __val=$$1
-+  __forbid=" $2 "
-+  if test -n "$__val"; then
-+    __new=""
-+    ac_save_IFS=$IFS
-+    IFS=" 	"
-+    for i in $__val; do
-+      case "$__forbid" in
-+        *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;;
-+	*) # Careful to not add spaces, where there were none, because otherwise
-+	   # libtool gets confused, if we change e.g. CXX
-+	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-+      esac
-+    done
-+    IFS=$ac_save_IFS
-+    $1=$__new
-+  fi
-+])
-+
-+
-+AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
-+[
-+  AC_MSG_CHECKING([whether $CC is blacklisted])
-+
-+  dnl In theory we have tu run this test against $CC and $CXX
-+  dnl in C and in C++ mode, because its perfectly legal for
-+  dnl the user to mix compiler versions, since C has a defined
-+  dnl ABI. 
-+  dnl 
-+  dnl For now, we assume the user is not on crack.
-+
-+  AC_TRY_COMPILE([
-+#ifdef __GNUC__
-+#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
-+choke me
-+#endif
-+#endif
-+], ,
-+  kde_bad_compiler=no, 
-+  kde_bad_compiler=yes
-+)
-+
-+  AC_MSG_RESULT($kde_bad_compiler)
-+
-+if test "$kde_bad_compiler" = "yes"; then
-+  AC_MSG_ERROR([
-+
-+This particular compiler version is blacklisted because it
-+is known to miscompile KDE. Please use a newer version, or
-+if that is not yet available, choose an older version. 
-+
-+Please do not report a bug or bother us reporting this
-+configure error. We know about it, and we introduced
-+it by intention to avoid untraceable bugs or crashes in KDE.
-+
-+])
-+fi
-+
-+])
-+
-+
-+AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
-+[
-+  AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
-+    kde_cv_opt_noinline_match,
-+  [
-+  kde_cv_opt_noinline_match=irrelevant
-+  dnl if we don't use both -O2 and -fno-inline, this check is moot
-+  if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
-+     && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
-+
-+    ac_cflags_save="$CFLAGS"
-+    CFLAGS="$CFLAGS -D_USE_GNU"
-+
-+    AC_TRY_LINK([
-+  #include <string.h>
-+], [  const char *pt, *et;
-+  et = __extension__      ({ char __a0, __a1, __a2;       (__builtin_constant_p (  ";,"  ) && ((size_t)(const void *)((   ";,"   )+ 1) - (size_t)(const void *)(   ";,"   ) == 1)        ? ((__a0 =((__const char  *) (  ";,"  ))[0], __a0 == '\0')     ? ((void) (  pt ),((void *)0) )        : ((__a1 = ((__const char *) (  ";,"  ))[1], __a1== '\0')      ? (__extension__ (__builtin_constant_p (  __a0 ) && ( __a0 ) == '\0'   ? (char *) __rawmemchr (   pt  ,   __a0)       : strchr(   pt  ,   __a0 )))   : ((__a2 = ((__const char *) (  ";,"  ))[2], __a2 == '\0')      ? __strpbrk_c2 (  pt , __a0, __a1)      :(((__const char *) (  ";,"  ))[3] == '\0'     ? __strpbrk_c3 (  pt ,__a0, __a1, __a2): strpbrk (  pt ,   ";,"  ))))) : strpbrk (  pt ,  ";,"  )); }) ;
-+],
-+    kde_cv_opt_noinline_match=yes,
-+    kde_cv_opt_noinline_match=no
-+    )
-+
-+    CFLAGS="$ac_cflags_save"
-+  fi
-+  ])
-+])
-+
-+
-+dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
-+AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
-+[dnl
-+if test "x$kde_use_qt_emb" != "xyes"; then
-+ AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
-+ AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
-+else
-+ AC_REMOVE_FORBIDDEN(CXX, [-rpath])
-+ AC_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath])
-+fi
-+])
-+
-+AC_DEFUN([AC_CHECK_COMPILERS],
-+[
-+  AC_ARG_ENABLE(debug,
-+	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
-+  [
-+    case $enableval in
-+      yes)
-+        kde_use_debug_code="yes"
-+        kde_use_debug_define=no
-+        ;;
-+      full)
-+        kde_use_debug_code="full"
-+        kde_use_debug_define=no
-+        ;;
-+      *)
-+        kde_use_debug_code="no"
-+        kde_use_debug_define=yes
-+        ;;
-+    esac
-+  ], 
-+    [kde_use_debug_code="no"
-+      kde_use_debug_define=no
-+  ])
-+
-+  dnl Just for configure --help
-+  AC_ARG_ENABLE(dummyoption,
-+	        AC_HELP_STRING([--disable-debug],
-+	  		       [disables debug output and debug symbols [default=no]]),
-+		[],[])
-+
-+  AC_ARG_ENABLE(strict,
-+		AC_HELP_STRING([--enable-strict],
-+			      [compiles with strict compiler options (may not work!)]),
-+   [
-+    if test $enableval = "no"; then
-+         kde_use_strict_options="no"
-+       else
-+         kde_use_strict_options="yes"
-+    fi
-+   ], [kde_use_strict_options="no"])
-+
-+  AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similar]),
-+   [
-+    if test $enableval = "no"; then
-+         kde_use_warnings="no"
-+       else
-+         kde_use_warnings="yes"
-+    fi
-+   ], [kde_use_warnings="yes"])
-+
-+  dnl enable warnings for debug build
-+  if test "$kde_use_debug_code" != "no"; then
-+    kde_use_warnings=yes
-+  fi
-+
-+  AC_ARG_ENABLE(profile,AC_HELP_STRING([--enable-profile],[creates profiling infos [default=no]]),
-+    [kde_use_profiling=$enableval],
-+    [kde_use_profiling="no"]
-+  )
-+
-+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-+  CFLAGS=" $CFLAGS"
-+
-+  AC_PROG_CC 
-+
-+  AC_PROG_CPP
-+
-+  if test "$GCC" = "yes"; then
-+    if test "$kde_use_debug_code" != "no"; then
-+      if test $kde_use_debug_code = "full"; then
-+        CFLAGS="-g3 -fno-inline $CFLAGS"
-+      else
-+        CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS"
-+      fi
-+    else
-+      CFLAGS="-O2 $CFLAGS"
-+    fi
-+  fi
-+
-+  if test "$kde_use_debug_define" = "yes"; then
-+    CFLAGS="-DNDEBUG $CFLAGS"
-+  fi
-+
-+
-+  case "$host" in
-+  *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
-+  *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
-+  esac
-+
-+  if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then
-+     LDFLAGS=""
-+  fi
-+
-+  CXXFLAGS=" $CXXFLAGS"
-+
-+  AC_PROG_CXX
-+
-+  KDE_CHECK_FOR_BAD_COMPILER
-+
-+  if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-+    if test "$kde_use_debug_code" != "no"; then
-+      if test "$CXX" = "KCC"; then
-+        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-+      else
-+        if test "$kde_use_debug_code" = "full"; then
-+          CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
-+        else
-+          CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS"
-+        fi
-+      fi
-+      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-+
-+      dnl convenience compiler flags
-+      KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""])
-+      AC_SUBST(WOVERLOADED_VIRTUAL)
-+    else
-+      if test "$CXX" = "KCC"; then
-+        CXXFLAGS="+K3 $CXXFLAGS"
-+      else
-+        CXXFLAGS="-O2 $CXXFLAGS"
-+      fi
-+    fi
-+  fi
-+
-+  if test "$kde_use_debug_define" = "yes"; then
-+    CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
-+  fi  
-+
-+  if test "$kde_use_profiling" = "yes"; then
-+    KDE_CHECK_COMPILER_FLAG(pg,
-+    [
-+      CFLAGS="-pg $CFLAGS"
-+      CXXFLAGS="-pg $CXXFLAGS"
-+    ])
-+  fi
-+
-+  if test "$kde_use_warnings" = "yes"; then
-+      if test "$GCC" = "yes"; then
-+        CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"
-+        case $host in
-+          *-*-linux-gnu)	
-+            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"
-+            KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
-+            KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
-+          ;;
-+        esac
-+        KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
-+        KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
-+        dnl ### FIXME: revert for KDE 4
-+        KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"])
-+     fi
-+  fi
-+
-+  if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then
-+    CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
-+  fi
-+
-+  AC_ARG_ENABLE(pch,
-+     AC_HELP_STRING([--enable-pch],
-+                    [enables precompiled header support (currently only KCC or gcc >=3.4+unsermake) [default=no]]),
-+    [ kde_use_pch=$enableval ],[ kde_use_pch=no ])
-+ 
-+  HAVE_GCC_VISIBILITY=0
-+  AC_SUBST([HAVE_GCC_VISIBILITY])
-+
-+  if test "$GXX" = "yes"; then
-+    gcc_no_reorder_blocks=NO
-+    KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES])
-+    if test $kde_use_debug_code != "no" && \
-+       test $kde_use_debug_code != "full" && \
-+       test "YES" = "$gcc_no_reorder_blocks" ; then
-+          CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
-+          CFLAGS="$CFLAGS -fno-reorder-blocks"
-+    fi
-+    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
-+    KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
-+    KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
-+    KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
-+    ENABLE_PERMISSIVE_FLAG="-fpermissive"
-+
-+    if test "$kde_use_pch" = "yes"; then
-+        AC_MSG_CHECKING(whether gcc supports precompiling c header files)
-+        echo >conftest.h
-+        if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
-+            kde_gcc_supports_pch=yes
-+            AC_MSG_RESULT(yes)
-+        else
-+            kde_gcc_supports_pch=no
-+            AC_MSG_RESULT(no)
-+        fi
-+        if test "$kde_gcc_supports_pch" = "yes"; then
-+            AC_MSG_CHECKING(whether gcc supports precompiling c++ header files)
-+            if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
-+                kde_gcc_supports_pch=yes
-+                AC_MSG_RESULT(yes)
-+            else
-+                kde_gcc_supports_pch=no
-+                AC_MSG_RESULT(no)
-+            fi
-+        fi
-+        rm -f conftest.h conftest.h.gch
-+    fi
-+
-+    KDE_CHECK_FOR_OPT_NOINLINE_MATCH
-+    if test "x$kde_cv_opt_noinline_match" = "xno" ; then
-+       CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-+    fi
-+  fi
-+  AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
-+  if test "$CXX" = "KCC"; then
-+    dnl unfortunately we currently cannot disable exception support in KCC
-+    dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
-+    dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"])
-+    dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS=	)
-+
-+    if test "$kde_use_pch" = "yes"; then
-+      dnl TODO: support --pch-dir!
-+      KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"])
-+      dnl the below works (but the dir must exist), but it's
-+      dnl useless for a whole package.
-+      dnl The are precompiled headers for each source file, so when compiling
-+      dnl from scratch, it doesn't make a difference, and they take up
-+      dnl around ~5Mb _per_ sourcefile.
-+      dnl KDE_CHECK_COMPILER_FLAG(-pch_dir /tmp,
-+      dnl   [CXXFLAGS="$CXXFLAGS --pch_dir `pwd`/pcheaders"])
-+    fi
-+    dnl this flag controls inlining. by default KCC inlines in optimisation mode
-+    dnl all implementations that are defined inside the class {} declaration. 
-+    dnl because of templates-compatibility with broken gcc compilers, this
-+    dnl can cause excessive inlining. This flag limits it to a sane level
-+    KDE_CHECK_COMPILER_FLAG(-inline_keyword_space_time=6,[CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"])
-+    KDE_CHECK_COMPILER_FLAG(-inline_auto_space_time=2,[CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"])
-+    KDE_CHECK_COMPILER_FLAG(-inline_implicit_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"])
-+    KDE_CHECK_COMPILER_FLAG(-inline_generated_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"])
-+    dnl Some source files are shared between multiple executables
-+    dnl (or libraries) and some of those need template instantiations.
-+    dnl In that case KCC needs to compile those sources with
-+    dnl --one_instantiation_per_object.  To make it easy for us we compile
-+    dnl _all_ objects with that flag (--one_per is a shorthand).
-+    KDE_CHECK_COMPILER_FLAG(-one_per, [CXXFLAGS="$CXXFLAGS --one_per"])
-+  fi
-+  AC_SUBST(USE_EXCEPTIONS)
-+  dnl obsolete macro - provided to keep things going
-+  USE_RTTI=
-+  AC_SUBST(USE_RTTI)
-+
-+  case "$host" in
-+      *-*-irix*)  test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;;
-+      *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";;
-+      *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";;
-+      *-*-solaris*) 
-+        if test "$GXX" = yes; then
-+          libstdcpp=`$CXX -print-file-name=libstdc++.so`
-+          if test ! -f $libstdcpp; then
-+             AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so])
-+          fi
-+        fi
-+        ;;
-+  esac
-+
-+  AC_VALIDIFY_CXXFLAGS
-+
-+  AC_PROG_CXXCPP
-+
-+  if test "$GCC" = yes; then
-+     NOOPT_CFLAGS=-O0
-+  fi
-+  KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0])
-+
-+  AC_ARG_ENABLE(coverage,
-+    AC_HELP_STRING([--enable-coverage],[use gcc coverage testing]), [
-+      if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
-+        ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
-+        ac_coverage_linker="-lgcc"
-+      elif test "$am_cv_CC_dependencies_compiler_type" = "gcc"; then
-+        ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
-+        ac_coverage_linker=""
-+      else
-+        AC_MSG_ERROR([coverage with your compiler is not supported])
-+      fi
-+      CFLAGS="$CFLAGS $ac_coverage_compiler"
-+      CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
-+      LDFLAGS="$LDFLAGS $ac_coverage_linker"
-+    ])
-+
-+  AC_SUBST(NOOPT_CXXFLAGS)
-+  AC_SUBST(NOOPT_CFLAGS)
-+  AC_SUBST(ENABLE_PERMISSIVE_FLAG)
-+
-+  KDE_CHECK_NEW_LDFLAGS
-+  KDE_CHECK_FINAL
-+  KDE_CHECK_CLOSURE
-+  KDE_CHECK_NMCHECK
-+
-+  ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
-+])
-+
-+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
-+  [
-+    AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
-+      [
-+        AC_LANG_SAVE
-+        AC_LANG_CPLUSPLUS
-+
-+        safe_CXXFLAGS=$CXXFLAGS
-+        safe_LDFLAGS=$LDFLAGS
-+        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+        LDFLAGS="$LDFLAGS -shared -fPIC"
-+
-+        AC_TRY_LINK(
-+        [
-+          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-+	  #include <string>
-+          int some_function( void ) __attribute__ ((visibility("default")));
-+          int some_function( void )
-+          {
-+	    std::string s("blafasel");
-+            return 0;
-+          }
-+        ], [/* elvis is alive */],
-+        kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
-+
-+        CXXFLAGS=$safe_CXXFLAGS
-+        LDFLAGS=$safe_LDFLAGS
-+        AC_LANG_RESTORE
-+      ]
-+    )
-+
-+    if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+    fi
-+  ]
-+)
-+
-+AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
-+[
-+  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
-+
-+  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
-+
-+  if test "x$GXX" = "xyes"; then
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    AC_EGREP_CPP(
-+       [GCC visibility push],
-+       [ #include <exception> 
-+       ], 
-+    [
-+      AC_MSG_RESULT(yes)
-+      kde_stdc_visibility_patched=yes ],
-+    [ 
-+      AC_MSG_RESULT(no)
-+      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
-+                   visibility support. Disabling -fvisibility=hidden])
-+
-+      kde_stdc_visibility_patched=no ])
-+
-+    AC_LANG_RESTORE
-+
-+    kde_have_gcc_visibility=no
-+    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
-+    [
-+      kde_have_gcc_visibility=yes
-+      dnl the whole toolchain is just a mess, gcc is just too buggy
-+      dnl to handle STL with visibility enabled. Lets reconsider 
-+      dnl when gcc 4.2 is out or when things get fixed in the compiler.
-+      dnl Contact mueller at kde.org for details.
-+      AC_ARG_ENABLE(gcc-hidden-visibility,
-+        AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
-+          [kde_have_gcc_visibility=$enableval],
-+          [kde_have_gcc_visibility=no])
-+
-+      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
-+        [
-+          AC_LANG_SAVE
-+          AC_LANG_CPLUSPLUS
-+
-+          safe_CXXFLAGS=$CXXFLAGS
-+          CXXFLAGS="$CXXFLAGS $all_includes"
-+
-+          AC_TRY_COMPILE(
-+          [
-+#include <qglobal.h>
-+#if Q_EXPORT - 0 != 0
-+/* if this compiles, then Q_EXPORT is undefined */
-+/* if Q_EXPORT is nonempty, this will break compilation */
-+#endif
-+          ], [/* elvis is alive */],
-+          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
-+
-+          CXXFLAGS=$safe_CXXFLAGS
-+          AC_LANG_RESTORE
-+        ]
-+      )
-+
-+      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
-+        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        KDE_CHECK_VISIBILITY_GCC_BUG
-+        HAVE_GCC_VISIBILITY=1
-+        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
-+      fi
-+    ])
-+  fi
-+])
-+
-+AC_DEFUN([KDE_ADD_DEPENDENCIES],
-+[
-+   [A]M_DEPENDENCIES(CC)
-+   [A]M_DEPENDENCIES(CXX)
-+])
-+
-+dnl just a wrapper to clean up configure.in
-+AC_DEFUN([KDE_PROG_LIBTOOL],
-+[
-+AC_REQUIRE([AC_CHECK_COMPILERS])
-+AC_REQUIRE([AC_ENABLE_SHARED])
-+AC_REQUIRE([AC_ENABLE_STATIC])
-+
-+AC_REQUIRE([AC_LIBTOOL_DLOPEN])
-+AC_REQUIRE([KDE_CHECK_LIB64])
-+
-+AC_OBJEXT
-+AC_EXEEXT
-+
-+AM_PROG_LIBTOOL
-+AC_LIBTOOL_CXX
-+
-+LIBTOOL_SHELL="/bin/sh ./libtool"
-+#  LIBTOOL="$LIBTOOL --silent"
-+KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
-+AC_SUBST(KDE_PLUGIN)
-+
-+# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
-+KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
-+AC_SUBST(KDE_CHECK_PLUGIN)
-+
-+# we patch configure quite some so we better keep that consistent for incremental runs 
-+AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
-+])
-+
-+AC_DEFUN([KDE_CHECK_LIB64],
-+[
-+    AC_ARG_ENABLE(libsuffix,
-+        AC_HELP_STRING([--enable-libsuffix],
-+            [/lib directory suffix (64,32,none,auto[=default])]),
-+            kdelibsuff=$enableval, kdelibsuff="auto")
-+    
-+    if test "$kdelibsuff" = "auto"; then
-+    
-+cat > conftest.c << EOF
-+#include <stdio.h>
-+int main() {
-+ return 0;
-+}
-+EOF
-+        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
-+    s,.*/lib\([[^\/]]*\)/.*,\1, 
-+    p 
-+}'`
-+	rm -rf conftest.*
-+    fi	
-+	
-+    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
-+       kdelibsuff=
-+    fi
-+    if test -z "$kdelibsuff"; then
-+        AC_MSG_RESULT([not using lib directory suffix])
-+        AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
-+    else
-+        if test "$libdir" = '${exec_prefix}/lib'; then
-+            libdir="$libdir${kdelibsuff}"
-+            AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
-+        fi
-+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
-+        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
-+    fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_TYPES],
-+[  AC_CHECK_SIZEOF(int, 4)dnl
-+   AC_CHECK_SIZEOF(short)dnl
-+  AC_CHECK_SIZEOF(long, 4)dnl
-+  AC_CHECK_SIZEOF(char *, 4)dnl
-+])dnl
-+
-+dnl Not used - kept for compat only?
-+AC_DEFUN([KDE_DO_IT_ALL],
-+[
-+AC_CANONICAL_SYSTEM
-+AC_ARG_PROGRAM
-+AM_INIT_AUTOMAKE($1, $2)
-+AM_DISABLE_LIBRARIES
-+AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
-+AC_CHECK_COMPILERS
-+KDE_PROG_LIBTOOL
-+AM_KDE_WITH_NLS
-+AC_PATH_KDE
-+])
-+
-+AC_DEFUN([AC_CHECK_RPATH],
-+[
-+AC_MSG_CHECKING(for rpath)
-+AC_ARG_ENABLE(rpath,
-+      AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]),
-+      USE_RPATH=$enableval, USE_RPATH=yes)
-+
-+if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-+
-+  KDE_RPATH="-R \$(libdir)"
-+
-+  if test "$kde_libraries" != "$libdir"; then
-+      KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
-+  fi
-+
-+  if test -n "$qt_libraries"; then
-+    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-+  fi
-+  dnl $x_libraries is set to /usr/lib in case
-+  if test -n "$X_LDFLAGS"; then
-+    X_RPATH="-R \$(x_libraries)"
-+    KDE_RPATH="$KDE_RPATH $X_RPATH"
-+  fi
-+  if test -n "$KDE_EXTRA_RPATH"; then
-+    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
-+  fi
-+fi
-+AC_SUBST(KDE_EXTRA_RPATH)
-+AC_SUBST(KDE_RPATH)
-+AC_SUBST(X_RPATH)
-+AC_MSG_RESULT($USE_RPATH)
-+])
-+
-+dnl Check for the type of the third argument of getsockname
-+AC_DEFUN([AC_CHECK_SOCKLEN_T],
-+[
-+   AC_MSG_CHECKING(for socklen_t)
-+   AC_CACHE_VAL(kde_cv_socklen_t,
-+   [
-+      AC_LANG_PUSH(C++)
-+      kde_cv_socklen_t=no
-+      AC_TRY_COMPILE([
-+         #include <sys/types.h>
-+         #include <sys/socket.h>
-+      ],
-+      [
-+         socklen_t len;
-+         getpeername(0,0,&len);
-+      ],
-+      [
-+         kde_cv_socklen_t=yes
-+         kde_cv_socklen_t_equiv=socklen_t
-+      ])
-+      AC_LANG_POP(C++)
-+   ])
-+   AC_MSG_RESULT($kde_cv_socklen_t)
-+   if test $kde_cv_socklen_t = no; then
-+      AC_MSG_CHECKING([for socklen_t equivalent for socket functions])
-+      AC_CACHE_VAL(kde_cv_socklen_t_equiv,
-+      [
-+         kde_cv_socklen_t_equiv=int
-+         AC_LANG_PUSH(C++)
-+         for t in int size_t unsigned long "unsigned long"; do
-+            AC_TRY_COMPILE([
-+               #include <sys/types.h>
-+               #include <sys/socket.h>
-+            ],
-+            [
-+               $t len;
-+               getpeername(0,0,&len);
-+            ],
-+            [
-+               kde_cv_socklen_t_equiv="$t"
-+               break
-+            ])
-+         done
-+         AC_LANG_POP(C++)
-+      ])
-+      AC_MSG_RESULT($kde_cv_socklen_t_equiv)
-+   fi
-+   AC_DEFINE_UNQUOTED(kde_socklen_t, $kde_cv_socklen_t_equiv,
-+                     [type to use in place of socklen_t if not defined])
-+   AC_DEFINE_UNQUOTED(ksize_t, $kde_cv_socklen_t_equiv,
-+                     [type to use in place of socklen_t if not defined (deprecated, use kde_socklen_t)])
-+])
-+
-+dnl This is a merge of some macros out of the gettext aclocal.m4
-+dnl since we don't need anything, I took the things we need
-+dnl the copyright for them is:
-+dnl >
-+dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-+dnl This Makefile.in is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl This program is distributed in the hope that it will be useful,
-+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+dnl PARTICULAR PURPOSE.
-+dnl >
-+dnl for this file it is relicensed under LGPL
-+
-+AC_DEFUN([AM_KDE_WITH_NLS],
-+  [
-+    dnl If we use NLS figure out what method
-+
-+    AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt,
-+        [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt)
-+    AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+
-+     if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
-+        AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it])
-+        GMSGFMT=":"
-+      fi
-+      MSGFMT=$GMSGFMT
-+      AC_SUBST(GMSGFMT)
-+      AC_SUBST(MSGFMT)
-+
-+      AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext,
-+	[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-+
-+      dnl Test whether we really found GNU xgettext.
-+      if test "$XGETTEXT" != ":"; then
-+	dnl If it is no GNU xgettext we define it as : so that the
-+	dnl Makefiles still can work.
-+	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+	  : ;
-+	else
-+	  AC_MSG_RESULT(
-+	    [found xgettext programs is not GNU xgettext; ignore it])
-+	  XGETTEXT=":"
-+	fi
-+      fi
-+     AC_SUBST(XGETTEXT)
-+
-+  ])
-+
-+# Search path for a program which passes the given test.
-+# Ulrich Drepper <drepper at cygnus.com>, 1996.
-+
-+# serial 1
-+# Stephan Kulow: I appended a _KDE against name conflicts
-+
-+dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR,
-+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-+AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE],
-+[# Extract the first word of "$2", so it can be a program name with args.
-+set dummy $2; ac_word=[$]2
-+AC_MSG_CHECKING([for $ac_word])
-+AC_CACHE_VAL(ac_cv_path_$1,
-+[case "[$]$1" in
-+  /*)
-+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if [$3]; then
-+	ac_cv_path_$1="$ac_dir/$ac_word"
-+	break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+dnl If no 4th arg is given, leave the cache variable unset,
-+dnl so AC_PATH_PROGS will keep looking.
-+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-+])dnl
-+  ;;
-+esac])dnl
-+$1="$ac_cv_path_$1"
-+if test -n "[$]$1"; then
-+  AC_MSG_RESULT([$]$1)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+AC_SUBST($1)dnl
-+])
-+
-+
-+# Check whether LC_MESSAGES is available in <locale.h>.
-+# Ulrich Drepper <drepper at cygnus.com>, 1995.
-+
-+# serial 1
-+
-+AC_DEFUN([AM_LC_MESSAGES],
-+  [if test $ac_cv_header_locale_h = yes; then
-+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-+    if test $am_cv_val_LC_MESSAGES = yes; then
-+      AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your locale.h file contains LC_MESSAGES])
-+    fi
-+  fi])
-+
-+dnl From Jim Meyering.
-+dnl FIXME: migrate into libit.
-+
-+AC_DEFUN([AM_FUNC_OBSTACK],
-+[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
-+ [AC_TRY_LINK([#include "obstack.h"],
-+	      [struct obstack *mem;obstack_free(mem,(char *) 0)],
-+	      am_cv_func_obstack=yes,
-+	      am_cv_func_obstack=no)])
-+ if test $am_cv_func_obstack = yes; then
-+   AC_DEFINE(HAVE_OBSTACK)
-+ else
-+   LIBOBJS="$LIBOBJS obstack.o"
-+ fi
-+])
-+
-+dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
-+dnl FIXME: Migrate into libit
-+
-+AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
-+[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
-+ [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
-+              am_cv_lib_error_at_line=yes,
-+	      am_cv_lib_error_at_line=no)])
-+ if test $am_cv_lib_error_at_line = no; then
-+   LIBOBJS="$LIBOBJS error.o"
-+ fi
-+ AC_SUBST(LIBOBJS)dnl
-+])
-+
-+# Macro to add for using GNU gettext.
-+# Ulrich Drepper <drepper at cygnus.com>, 1995.
-+
-+# serial 1
-+# Stephan Kulow: I put a KDE in it to avoid name conflicts
-+
-+AC_DEFUN([AM_KDE_GNU_GETTEXT],
-+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+   AC_REQUIRE([AC_PROG_RANLIB])dnl
-+   AC_REQUIRE([AC_HEADER_STDC])dnl
-+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-+   AC_REQUIRE([AC_FUNC_MMAP])dnl
-+   AC_REQUIRE([AM_KDE_WITH_NLS])dnl
-+   AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h])
-+   AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \
-+__argz_count __argz_stringify __argz_next])
-+
-+   AC_MSG_CHECKING(for stpcpy)
-+   AC_CACHE_VAL(kde_cv_func_stpcpy,
-+   [
-+   kde_safe_cxxflags=$CXXFLAGS
-+   CXXFLAGS="-Werror"
-+   AC_LANG_SAVE
-+   AC_LANG_CPLUSPLUS
-+   AC_TRY_COMPILE([
-+   #include <string.h>
-+   ],
-+   [
-+   char buffer[200];
-+   stpcpy(buffer, buffer);
-+   ],
-+   kde_cv_func_stpcpy=yes,
-+   kde_cv_func_stpcpy=no)
-+   AC_LANG_RESTORE
-+   CXXFLAGS=$kde_safe_cxxflags
-+   ])
-+   AC_MSG_RESULT($kde_cv_func_stpcpy)
-+   if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then
-+     AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy])
-+   fi
-+
-+   AM_LC_MESSAGES
-+
-+   if test "x$CATOBJEXT" != "x"; then
-+     if test "x$ALL_LINGUAS" = "x"; then
-+       LINGUAS=
-+     else
-+       AC_MSG_CHECKING(for catalogs to be installed)
-+       NEW_LINGUAS=
-+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-+         case "$ALL_LINGUAS" in
-+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-+         esac
-+       done
-+       LINGUAS=$NEW_LINGUAS
-+       AC_MSG_RESULT($LINGUAS)
-+     fi
-+
-+     dnl Construct list of names of catalog files to be constructed.
-+     if test -n "$LINGUAS"; then
-+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-+     fi
-+   fi
-+
-+  ])
-+
-+AC_DEFUN([AC_HAVE_XPM],
-+ [AC_REQUIRE_CPP()dnl
-+  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+
-+ test -z "$XPM_LDFLAGS" && XPM_LDFLAGS=
-+ test -z "$XPM_INCLUDE" && XPM_INCLUDE=
-+
-+ AC_ARG_WITH(xpm,AC_HELP_STRING([--without-xpm],[disable color pixmap XPM tests]),
-+	xpm_test=$withval, xpm_test="yes")
-+ if test "x$xpm_test" = xno; then
-+   ac_cv_have_xpm=no
-+ else
-+   AC_MSG_CHECKING(for XPM)
-+   AC_CACHE_VAL(ac_cv_have_xpm,
-+   [
-+    ac_save_ldflags="$LDFLAGS"
-+    ac_save_cflags="$CFLAGS"
-+    if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
-+    else
-+      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET"
-+    fi
-+    CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES"
-+    test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
-+    AC_TRY_LINK([#include <X11/xpm.h>],[],
-+	ac_cv_have_xpm="yes",ac_cv_have_xpm="no")
-+    LDFLAGS="$ac_save_ldflags"
-+    CFLAGS="$ac_save_cflags"
-+   ])dnl
-+
-+  if test "$ac_cv_have_xpm" = no; then
-+    AC_MSG_RESULT(no)
-+    XPM_LDFLAGS=""
-+    XPMINC=""
-+    $2
-+  else
-+    AC_DEFINE(HAVE_XPM, 1, [Define if you have XPM support])
-+    if test "$XPM_LDFLAGS" = ""; then
-+       XPMLIB='-lXpm $(LIB_X11)'
-+    else
-+       XPMLIB="-L$XPM_LDFLAGS -lXpm "'$(LIB_X11)'
-+    fi
-+    if test "$XPM_INCLUDE" = ""; then
-+       XPMINC=""
-+    else
-+       XPMINC="-I$XPM_INCLUDE"
-+    fi
-+    AC_MSG_RESULT(yes)
-+    $1
-+  fi
-+ fi
-+ AC_SUBST(XPMINC)
-+ AC_SUBST(XPMLIB)
-+])
-+
-+AC_DEFUN([AC_HAVE_DPMS],
-+ [AC_REQUIRE_CPP()dnl
-+  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+
-+ test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS=
-+ test -z "$DPMS_INCLUDE" && DPMS_INCLUDE=
-+ DPMS_LIB=
-+
-+ AC_ARG_WITH(dpms,AC_HELP_STRING([--without-dpms],[disable DPMS power saving]),
-+	dpms_test=$withval, dpms_test="yes")
-+ if test "x$dpms_test" = xno; then
-+   ac_cv_have_dpms=no
-+ else
-+   AC_MSG_CHECKING(for DPMS)
-+   dnl Note: ac_cv_have_dpms can be no, yes, or -lXdpms.
-+   dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms".
-+   AC_CACHE_VAL(ac_cv_have_dpms,
-+   [
-+    if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then
-+      AC_MSG_RESULT(no)
-+      ac_cv_have_dpms="no"
-+    else
-+      ac_save_ldflags="$LDFLAGS"
-+      ac_save_cflags="$CFLAGS"
-+      ac_save_libs="$LIBS"
-+      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries"
-+      LIBS="-lX11 -lXext $LIBSOCKET"
-+      CFLAGS="$CFLAGS $X_INCLUDES"
-+      test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-+      AC_TRY_LINK([
-+	  #include <X11/Xproto.h>
-+	  #include <X11/X.h>
-+	  #include <X11/Xlib.h>
-+	  #include <X11/extensions/dpms.h>
-+	  int foo_test_dpms()
-+	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
-+	  ac_cv_have_dpms="yes", [
-+              LIBS="-lXdpms $LIBS"
-+              AC_TRY_LINK([
-+	          #include <X11/Xproto.h>
-+        	  #include <X11/X.h>
-+        	  #include <X11/Xlib.h>
-+        	  #include <X11/extensions/dpms.h>
-+        	  int foo_test_dpms()
-+        	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
-+        	  [
-+                  ac_cv_have_dpms="-lXdpms"
-+                  ],ac_cv_have_dpms="no")
-+              ])
-+      LDFLAGS="$ac_save_ldflags"
-+      CFLAGS="$ac_save_cflags"
-+      LIBS="$ac_save_libs"
-+    fi
-+   ])dnl
-+
-+  if test "$ac_cv_have_dpms" = no; then
-+    AC_MSG_RESULT(no)
-+    DPMS_LDFLAGS=""
-+    DPMSINC=""
-+    $2
-+  else
-+    AC_DEFINE(HAVE_DPMS, 1, [Define if you have DPMS support])
-+    if test "$ac_cv_have_dpms" = "-lXdpms"; then
-+       DPMS_LIB="-lXdpms"
-+    fi
-+    if test "$DPMS_LDFLAGS" = ""; then
-+       DPMSLIB="$DPMS_LIB "'$(LIB_X11)'
-+    else
-+       DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)'
-+    fi
-+    if test "$DPMS_INCLUDE" = ""; then
-+       DPMSINC=""
-+    else
-+       DPMSINC="-I$DPMS_INCLUDE"
-+    fi
-+    AC_MSG_RESULT(yes)
-+    $1
-+  fi
-+ fi
-+ ac_save_cflags="$CFLAGS"
-+ CFLAGS="$CFLAGS $X_INCLUDES"
-+ test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-+ AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO,
-+   [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
-+ AC_CHECK_DECL(DPMSCapable,
-+   AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
-+   [#include <X11/Xlib.h>
-+   #include <X11/extensions/dpms.h>])
-+ AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
-+   [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
-+ AC_CHECK_DECL(DPMSInfo,
-+   AC_DEFINE(HAVE_DPMSINFO_PROTO),,
-+   [#include <X11/Xlib.h>
-+   #include <X11/extensions/dpms.h>])
-+ CFLAGS="$ac_save_cflags"
-+ AC_SUBST(DPMSINC)
-+ AC_SUBST(DPMSLIB)
-+])
-+
-+AC_DEFUN([AC_HAVE_GL],
-+ [AC_REQUIRE_CPP()dnl
-+  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+
-+ test -z "$GL_LDFLAGS" && GL_LDFLAGS=
-+ test -z "$GL_INCLUDE" && GL_INCLUDE=
-+
-+ AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
-+	gl_test=$withval, gl_test="yes")
-+ if test "x$kde_use_qt_emb" = "xyes"; then
-+   # GL and Qt Embedded is a no-go for now.
-+   ac_cv_have_gl=no
-+ elif test "x$gl_test" = xno; then
-+   ac_cv_have_gl=no
-+ else
-+   AC_MSG_CHECKING(for GL)
-+   AC_CACHE_VAL(ac_cv_have_gl,
-+   [
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    ac_save_ldflags=$LDFLAGS
-+    ac_save_cxxflags=$CXXFLAGS
-+    ac_save_libs=$LIBS
-+    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
-+    LIBS="$LIBS -lGL -lGLU"
-+    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
-+    LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
-+    CXXFLAGS="$CFLAGS $X_INCLUDES"
-+    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-+    AC_TRY_LINK([#include <GL/gl.h>
-+#include <GL/glu.h>
-+], [],
-+	ac_cv_have_gl="yes", ac_cv_have_gl="no")
-+    AC_LANG_RESTORE
-+    LDFLAGS=$ac_save_ldflags
-+    CXXFLAGS=$ac_save_cxxflags
-+    LIBS=$ac_save_libs
-+   ])dnl
-+
-+  if test "$ac_cv_have_gl" = "no"; then
-+    AC_MSG_RESULT(no)
-+    GL_LDFLAGS=""
-+    GLINC=""
-+    $2
-+  else
-+    AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
-+    if test "$GL_LDFLAGS" = ""; then
-+       GLLIB='-lGLU -lGL $(LIB_X11)'
-+    else
-+       GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
-+    fi
-+    if test "$GL_INCLUDE" = ""; then
-+       GLINC=""
-+    else
-+       GLINC="-I$GL_INCLUDE"
-+    fi
-+    AC_MSG_RESULT($ac_cv_have_gl)
-+    $1
-+  fi
-+ fi
-+ AC_SUBST(GLINC)
-+ AC_SUBST(GLLIB)
-+])
-+
-+
-+ dnl shadow password and PAM magic - maintained by ossi at kde.org
-+
-+AC_DEFUN([KDE_PAM], [
-+  AC_REQUIRE([KDE_CHECK_LIBDL])
-+
-+  want_pam=
-+  AC_ARG_WITH(pam,
-+    AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
-+    [ if test "x$withval" = "xyes"; then
-+        want_pam=yes
-+        pam_service=kde
-+      elif test "x$withval" = "xno"; then
-+        want_pam=no
-+      else
-+        want_pam=yes
-+        pam_service=$withval
-+      fi
-+    ], [ pam_service=kde ])
-+
-+  use_pam=
-+  PAMLIBS=
-+  if test "x$want_pam" != xno; then
-+    AC_CHECK_LIB(pam, pam_start, [
-+      AC_CHECK_HEADER(security/pam_appl.h,
-+        [ pam_header=security/pam_appl.h ],
-+        [ AC_CHECK_HEADER(pam/pam_appl.h,
-+            [ pam_header=pam/pam_appl.h ],
-+            [
-+    AC_MSG_WARN([PAM detected, but no headers found!
-+Make sure you have the necessary development packages installed.])
-+            ]
-+          )
-+        ]
-+      )
-+    ], , $LIBDL)
-+    if test -z "$pam_header"; then
-+      if test "x$want_pam" = xyes; then
-+        AC_MSG_ERROR([--with-pam was specified, but cannot compile with PAM!])
-+      fi
-+    else
-+      AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
-+      PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
-+      use_pam=yes
-+
-+      dnl darwin claims to be something special
-+      if test "$pam_header" = "pam/pam_appl.h"; then
-+        AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your PAM headers are in pam/ instead of security/])
-+      fi
-+
-+      dnl test whether struct pam_message is const (Linux) or not (Sun)
-+      AC_MSG_CHECKING(for const pam_message)
-+      AC_EGREP_HEADER([struct pam_message], $pam_header,
-+        [ AC_EGREP_HEADER([const struct pam_message], $pam_header,
-+                          [AC_MSG_RESULT([const: Linux-type PAM])],
-+                          [AC_MSG_RESULT([nonconst: Sun-type PAM])
-+                          AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])]
-+                          )],
-+        [AC_MSG_RESULT([not found - assume const, Linux-type PAM])])
-+    fi
-+  fi
-+
-+  AC_SUBST(PAMLIBS)
-+])
-+
-+dnl DEF_PAM_SERVICE(arg name, full name, define name)
-+AC_DEFUN([DEF_PAM_SERVICE], [
-+  AC_ARG_WITH($1-pam,
-+    AC_HELP_STRING([--with-$1-pam=[val]],[override PAM service from --with-pam for $2]),
-+    [ if test "x$use_pam" = xyes; then
-+        $3_PAM_SERVICE=$withval
-+      else
-+        AC_MSG_ERROR([Cannot use use --with-$1-pam, as no PAM was detected.
-+You may want to enforce it by using --with-pam.])
-+      fi
-+    ], 
-+    [ if test "x$use_pam" = xyes; then
-+        $3_PAM_SERVICE="$pam_service"
-+      fi
-+    ])
-+    if test -n "$$3_PAM_SERVICE"; then
-+      AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE])
-+      AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2])
-+    fi
-+    AC_SUBST($3_PAM_SERVICE)
-+])
-+
-+AC_DEFUN([KDE_SHADOWPASSWD], [
-+  AC_REQUIRE([KDE_PAM])
-+
-+  AC_CHECK_LIB(shadow, getspent,
-+    [ LIBSHADOW="-lshadow"
-+      ac_use_shadow=yes
-+    ],
-+    [ dnl for UnixWare
-+      AC_CHECK_LIB(gen, getspent, 
-+        [ LIBGEN="-lgen"
-+          ac_use_shadow=yes
-+        ], 
-+        [ AC_CHECK_FUNC(getspent, 
-+            [ ac_use_shadow=yes ],
-+            [ ac_use_shadow=no ])
-+	])
-+    ])
-+  AC_SUBST(LIBSHADOW)
-+  AC_SUBST(LIBGEN)
-+  
-+  AC_MSG_CHECKING([for shadow passwords])
-+
-+  AC_ARG_WITH(shadow,
-+    AC_HELP_STRING([--with-shadow],[If you want shadow password support]),
-+    [ if test "x$withval" != "xno"; then
-+        use_shadow=yes
-+      else
-+        use_shadow=no
-+      fi
-+    ], [
-+      use_shadow="$ac_use_shadow"
-+    ])
-+
-+  if test "x$use_shadow" = xyes; then
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE(HAVE_SHADOW, 1, [Define if you use shadow passwords])
-+  else
-+    AC_MSG_RESULT(no)
-+    LIBSHADOW=
-+    LIBGEN=
-+  fi
-+
-+  dnl finally make the relevant binaries setuid root, if we have shadow passwds.
-+  dnl this still applies, if we could use it indirectly through pam.
-+  if test "x$use_shadow" = xyes || 
-+     ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then
-+      case $host in
-+      *-*-freebsd* | *-*-netbsd* | *-*-openbsd*)
-+	SETUIDFLAGS="-m 4755 -o root";;
-+      *)
-+	SETUIDFLAGS="-m 4755";;
-+      esac
-+  fi
-+  AC_SUBST(SETUIDFLAGS)
-+
-+])
-+
-+AC_DEFUN([KDE_PASSWDLIBS], [
-+  AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
-+  AC_REQUIRE([KDE_PAM])
-+  AC_REQUIRE([KDE_SHADOWPASSWD])
-+
-+  if test "x$use_pam" = "xyes"; then 
-+    PASSWDLIBS="$PAMLIBS"
-+  else
-+    PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN"
-+  fi
-+
-+  dnl FreeBSD uses a shadow-like setup, where /etc/passwd holds the users, but
-+  dnl /etc/master.passwd holds the actual passwords.  /etc/master.passwd requires
-+  dnl root to read, so kcheckpass needs to be root (even when using pam, since pam
-+  dnl may need to read /etc/master.passwd).
-+  case $host in
-+  *-*-freebsd*)
-+    SETUIDFLAGS="-m 4755 -o root"
-+    ;;
-+  *)
-+    ;;
-+  esac
-+
-+  AC_SUBST(PASSWDLIBS)
-+])
-+
-+AC_DEFUN([KDE_CHECK_LIBDL],
-+[
-+AC_CHECK_LIB(dl, dlopen, [
-+LIBDL="-ldl"
-+ac_cv_have_dlfcn=yes
-+])
-+
-+AC_CHECK_LIB(dld, shl_unload, [
-+LIBDL="-ldld"
-+ac_cv_have_shload=yes
-+])
-+
-+AC_SUBST(LIBDL)
-+])
-+
-+AC_DEFUN([KDE_CHECK_DLOPEN],
-+[
-+KDE_CHECK_LIBDL
-+AC_CHECK_HEADERS(dlfcn.h dl.h)
-+if test "$ac_cv_header_dlfcn_h" = "no"; then
-+  ac_cv_have_dlfcn=no
-+fi
-+
-+if test "$ac_cv_header_dl_h" = "no"; then
-+  ac_cv_have_shload=no
-+fi
-+
-+dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE
-+dnl (MM)
-+AC_ARG_ENABLE(dlopen,
-+AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]),
-+enable_dlopen=$enableval,
-+enable_dlopen=yes)
-+
-+# override the user's opinion, if we know it better ;)
-+if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then
-+  enable_dlopen=no
-+fi
-+
-+if test "$ac_cv_have_dlfcn" = "yes"; then
-+  AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn])
-+fi
-+
-+if test "$ac_cv_have_shload" = "yes"; then
-+  AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload])
-+fi
-+
-+if test "$enable_dlopen" = no ; then
-+  test -n "$1" && eval $1
-+else
-+  test -n "$2" && eval $2
-+fi
-+
-+])
-+
-+AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
-+[
-+KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no)
-+KDE_PROG_LIBTOOL
-+AC_MSG_CHECKING([dynamic loading])
-+eval "`egrep '^build_libtool_libs=' libtool`"
-+if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then
-+  dynamic_loading=yes
-+  AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING)
-+else
-+  dynamic_loading=no
-+fi
-+AC_MSG_RESULT($dynamic_loading)
-+if test "$dynamic_loading" = "yes"; then
-+  $1
-+else
-+  $2
-+fi
-+])
-+
-+AC_DEFUN([KDE_ADD_INCLUDES],
-+[
-+if test -z "$1"; then
-+  test_include="Pix.h"
-+else
-+  test_include="$1"
-+fi
-+
-+AC_MSG_CHECKING([for libg++ ($test_include)])
-+
-+AC_CACHE_VAL(kde_cv_libgpp_includes,
-+[
-+kde_cv_libgpp_includes=no
-+
-+   for ac_dir in               \
-+                               \
-+     /usr/include/g++          \
-+     /usr/include              \
-+     /usr/unsupported/include  \
-+     /opt/include              \
-+     $extra_include            \
-+     ; \
-+   do
-+     if test -r "$ac_dir/$test_include"; then
-+       kde_cv_libgpp_includes=$ac_dir
-+       break
-+     fi
-+   done
-+])
-+
-+AC_MSG_RESULT($kde_cv_libgpp_includes)
-+if test "$kde_cv_libgpp_includes" != "no"; then
-+  all_includes="-I$kde_cv_libgpp_includes $all_includes $USER_INCLUDES"
-+fi
-+])
-+])
-+
-+AC_DEFUN([KDE_CHECK_LIBPTHREAD],
-+[
-+  dnl This code is here specifically to handle the
-+  dnl various flavors of threading library on FreeBSD
-+  dnl 4-, 5-, and 6-, and the (weird) rules around it.
-+  dnl There may be an environment PTHREAD_LIBS that 
-+  dnl specifies what to use; otherwise, search for it.
-+  dnl -pthread is special cased and unsets LIBPTHREAD
-+  dnl below if found.
-+  LIBPTHREAD=""
-+
-+  if test -n "$PTHREAD_LIBS"; then
-+    if test "x$PTHREAD_LIBS" = "x-pthread" ; then
-+      LIBPTHREAD="PTHREAD"
-+    else
-+      PTHREAD_LIBS_save="$PTHREAD_LIBS"
-+      PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
-+      AC_MSG_CHECKING([for pthread_create in $PTHREAD_LIBS])
-+      KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [
-+          LIBPTHREAD="$PTHREAD_LIBS_save"])
-+      PTHREAD_LIBS="$PTHREAD_LIBS_save"
-+    fi
-+  fi
-+
-+  dnl Is this test really needed, in the face of the Tru64 test below?
-+  if test -z "$LIBPTHREAD"; then
-+    AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"])
-+  fi
-+
-+  dnl This is a special Tru64 check, see BR 76171 issue #18.
-+  if test -z "$LIBPTHREAD" ; then
-+    AC_MSG_CHECKING([for pthread_create in -lpthread])
-+    kde_safe_libs=$LIBS
-+    LIBS="$LIBS -lpthread"
-+    AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[
-+        AC_MSG_RESULT(yes)
-+        LIBPTHREAD="-lpthread"],[
-+	AC_MSG_RESULT(no)])
-+    LIBS=$kde_safe_libs
-+  fi
-+
-+  dnl Un-special-case for FreeBSD.
-+  if test "x$LIBPTHREAD" = "xPTHREAD" ; then
-+    LIBPTHREAD=""
-+  fi
-+
-+  AC_SUBST(LIBPTHREAD)
-+])
-+
-+AC_DEFUN([KDE_CHECK_PTHREAD_OPTION],
-+[
-+      USE_THREADS=""
-+      if test -z "$LIBPTHREAD"; then
-+        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"])
-+      fi
-+
-+    AH_VERBATIM(__svr_define, [
-+#if defined(__SVR4) && !defined(__svr4__)
-+#define __svr4__ 1
-+#endif
-+])
-+    case $host_os in
-+ 	solaris*)
-+		KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"])
-+                CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
-+    		;;
-+        freebsd*)
-+                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
-+                ;;
-+        aix*)
-+                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-+                LIBPTHREAD="$LIBPTHREAD -lc_r"
-+                ;;
-+        linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-+                if test "$CXX" = "KCC"; then
-+                  CXXFLAGS="$CXXFLAGS --thread_safe"
-+		  NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
-+                fi
-+                ;;
-+	*)
-+		;;
-+    esac
-+    AC_SUBST(USE_THREADS)
-+    AC_SUBST(LIBPTHREAD)
-+])
-+
-+AC_DEFUN([KDE_CHECK_THREADING],
-+[
-+  AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-+  AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION])
-+  dnl default is yes if libpthread is found and no if no libpthread is available
-+  if test -z "$LIBPTHREAD"; then
-+    if test -z "$USE_THREADS"; then
-+      kde_check_threading_default=no
-+    else
-+      kde_check_threading_default=yes
-+    fi
-+  else
-+    kde_check_threading_default=yes
-+  fi
-+  AC_ARG_ENABLE(threading,AC_HELP_STRING([--disable-threading],[disables threading even if libpthread found]),
-+   kde_use_threading=$enableval, kde_use_threading=$kde_check_threading_default)
-+  if test "x$kde_use_threading" = "xyes"; then
-+    AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)])
-+  fi
-+])
-+
-+AC_DEFUN([KDE_TRY_LINK_PYTHON],
-+[
-+if test "$kde_python_link_found" = no; then
-+
-+if test "$1" = normal; then
-+  AC_MSG_CHECKING(if a Python application links)
-+else
-+  AC_MSG_CHECKING(if Python depends on $2)
-+fi
-+
-+AC_CACHE_VAL(kde_cv_try_link_python_$1,
-+[
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+AC_TRY_LINK(
-+[
-+#include <Python.h>
-+],[
-+	PySys_SetArgv(1, 0);
-+],
-+	[kde_cv_try_link_python_$1=yes],
-+	[kde_cv_try_link_python_$1=no]
-+)
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+])
-+
-+if test "$kde_cv_try_link_python_$1" = "yes"; then
-+  AC_MSG_RESULT(yes)
-+  kde_python_link_found=yes
-+  if test ! "$1" = normal; then
-+    LIBPYTHON="$LIBPYTHON $2"
-+  fi
-+  $3
-+else
-+  AC_MSG_RESULT(no)
-+  $4
-+fi
-+
-+fi
-+
-+])
-+
-+AC_DEFUN([KDE_CHECK_PYTHON_DIR],
-+[
-+AC_MSG_CHECKING([for Python directory])
-+ 
-+AC_CACHE_VAL(kde_cv_pythondir,
-+[
-+  if test -z "$PYTHONDIR"; then
-+    kde_cv_pythondir=/usr/local
-+  else
-+    kde_cv_pythondir="$PYTHONDIR"
-+  fi
-+])
-+ 
-+AC_ARG_WITH(pythondir,
-+AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]),
-+[
-+  ac_python_dir=$withval
-+], ac_python_dir=$kde_cv_pythondir
-+)
-+ 
-+AC_MSG_RESULT($ac_python_dir)
-+])
-+
-+AC_DEFUN([KDE_CHECK_PYTHON_INTERN],
-+[
-+AC_REQUIRE([KDE_CHECK_LIBDL])
-+AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-+AC_REQUIRE([KDE_CHECK_PYTHON_DIR])
-+
-+if test -z "$1"; then
-+  version="1.5"
-+else
-+  version="$1"
-+fi
-+
-+AC_MSG_CHECKING([for Python$version])
-+
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-+AC_FIND_FILE(Python.h, $python_incdirs, python_incdir)
-+if test ! -r $python_incdir/Python.h; then
-+  AC_FIND_FILE(python$version/Python.h, $python_incdirs, python_incdir)
-+  python_incdir=$python_incdir/python$version
-+  if test ! -r $python_incdir/Python.h; then
-+    python_incdir=no
-+  fi
-+fi
-+
-+PYTHONINC=-I$python_incdir
-+
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-+AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
-+if test ! -r $python_libdir/libpython$version.so; then
-+  AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
-+  if test ! -r $python_libdir/libpython$version.a; then
-+    AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir)
-+    python_libdir=$python_libdir/python$version/config
-+    if test ! -r $python_libdir/libpython$version.a; then
-+      python_libdir=no
-+    fi
-+  fi
-+fi
-+
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+  LIBPYTHON=-lpython$version
-+fi
-+
-+AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+  python_moddir=no
-+fi
-+
-+PYTHONMODDIR=$python_moddir
-+
-+AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir)
-+
-+if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-+   LIBPYTHON=$kde_orig_LIBPYTHON
-+   test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+   test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-+   $2
-+else 
-+  dnl Note: this test is very weak
-+  kde_python_link_found=no
-+  KDE_TRY_LINK_PYTHON(normal)
-+  KDE_TRY_LINK_PYTHON(m, -lm)
-+  KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD)
-+  KDE_TRY_LINK_PYTHON(tcl, -ltcl)
-+  KDE_TRY_LINK_PYTHON(db2, -ldb2)
-+  KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm])
-+  KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil])
-+  KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil])
-+  KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3])
-+  KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil])
-+  KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm])
-+  KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm -lpanel -lcurses])
-+  KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
-+	[AC_MSG_WARN([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])
-+	])
-+
-+  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-+  AC_SUBST(PYTHONINC)
-+  AC_SUBST(PYTHONLIB)
-+  AC_SUBST(LIBPYTHON)
-+  AC_SUBST(PYTHONMODDIR)
-+  AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python])
-+fi
-+
-+])
-+
-+
-+AC_DEFUN([KDE_CHECK_PYTHON],
-+[
-+  KDE_CHECK_PYTHON_INTERN("2.5",
-+    [KDE_CHECK_PYTHON_INTERN("2.4",
-+     [KDE_CHECK_PYTHON_INTERN("2.3", 
-+       [KDE_CHECK_PYTHON_INTERN("2.2", 
-+         [KDE_CHECK_PYTHON_INTERN("2.1", 
-+           [KDE_CHECK_PYTHON_INTERN("2.0", 
-+             [KDE_CHECK_PYTHON_INTERN($1, $2) ])
-+           ])
-+         ])
-+       ])
-+     ])
-+  ])
-+])
-+
-+AC_DEFUN([KDE_CHECK_STL],
-+[
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    ac_save_CXXFLAGS="$CXXFLAGS"
-+    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-+
-+    AC_MSG_CHECKING([if C++ programs can be compiled])
-+    AC_CACHE_VAL(kde_cv_stl_works,
-+    [
-+      AC_TRY_COMPILE([
-+#include <string>
-+using namespace std;
-+],[
-+  string astring="Hallo Welt.";
-+  astring.erase(0, 6); // now astring is "Welt"
-+  return 0;
-+], kde_cv_stl_works=yes,
-+   kde_cv_stl_works=no)
-+])
-+
-+   AC_MSG_RESULT($kde_cv_stl_works)
-+
-+   if test "$kde_cv_stl_works" = "yes"; then
-+     # back compatible
-+	 AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
-+   else
-+	 AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs.
-+Check config.log for details - if you're using a Linux distribution you might miss
-+a package named similar to libstdc++-dev.])
-+   fi
-+
-+   CXXFLAGS="$ac_save_CXXFLAGS"
-+   AC_LANG_RESTORE
-+])
-+
-+AC_DEFUN([AC_FIND_QIMGIO],
-+   [AC_REQUIRE([AC_FIND_JPEG])
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+AC_MSG_CHECKING([for qimgio])
-+AC_CACHE_VAL(ac_cv_lib_qimgio,
-+[
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+ac_save_LIBS="$LIBS"
-+ac_save_CXXFLAGS="$CXXFLAGS"
-+LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
-+CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-+AC_TRY_RUN(dnl
-+[
-+#include <qimageio.h>
-+#include <qstring.h>
-+int main() {
-+		QString t = "hallo";
-+		t.fill('t');
-+		qInitImageIO();
-+}
-+],
-+            ac_cv_lib_qimgio=yes,
-+            ac_cv_lib_qimgio=no,
-+	    ac_cv_lib_qimgio=no)
-+LIBS="$ac_save_LIBS"
-+CXXFLAGS="$ac_save_CXXFLAGS"
-+AC_LANG_RESTORE
-+])dnl
-+if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then
-+  LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG"
-+  AC_MSG_RESULT(yes)
-+  AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available])
-+  AC_SUBST(LIBQIMGIO)
-+else
-+  AC_MSG_RESULT(not found)
-+fi
-+])
-+
-+AC_DEFUN([AM_DISABLE_LIBRARIES],
-+[
-+    AC_PROVIDE([AM_ENABLE_STATIC])
-+    AC_PROVIDE([AM_ENABLE_SHARED])
-+    enable_static=no
-+    enable_shared=yes
-+])
-+
-+
-+AC_DEFUN([AC_CHECK_UTMP_FILE],
-+[
-+    AC_MSG_CHECKING([for utmp file])
-+
-+    AC_CACHE_VAL(kde_cv_utmp_file,
-+    [
-+    kde_cv_utmp_file=no
-+
-+    for ac_file in    \
-+                      \
-+	/var/run/utmp \
-+	/var/adm/utmp \
-+	/etc/utmp     \
-+     ; \
-+    do
-+     if test -r "$ac_file"; then
-+       kde_cv_utmp_file=$ac_file
-+       break
-+     fi
-+    done
-+    ])
-+
-+    if test "$kde_cv_utmp_file" != "no"; then
-+	AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-+	$1
-+	AC_MSG_RESULT($kde_cv_utmp_file)
-+    else
-+    	$2
-+	AC_MSG_RESULT([non found])
-+    fi
-+])
-+
-+
-+AC_DEFUN([KDE_CREATE_SUBDIRSLIST],
-+[
-+
-+DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
-+TOPSUBDIRS=""
-+
-+if test ! -s $srcdir/subdirs; then
-+  dnl Note: Makefile.common creates subdirs, so this is just a fallback
-+  files=`cd $srcdir && ls -1`
-+  dirs=`for i in $files; do if test -d $i; then echo $i; fi; done`
-+  for i in $dirs; do
-+    echo $i >> $srcdir/subdirs
-+  done
-+fi
-+
-+ac_topsubdirs=
-+if test -s $srcdir/inst-apps; then
-+  ac_topsubdirs="`cat $srcdir/inst-apps`"
-+elif test -s $srcdir/subdirs; then
-+  ac_topsubdirs="`cat $srcdir/subdirs`"
-+fi
-+
-+for i in $ac_topsubdirs; do
-+  AC_MSG_CHECKING([if $i should be compiled])
-+  if test -d $srcdir/$i; then
-+    install_it="yes"
-+    for j in $DO_NOT_COMPILE; do
-+      if test $i = $j; then
-+        install_it="no"
-+      fi
-+    done
-+  else
-+    install_it="no"
-+  fi
-+  AC_MSG_RESULT($install_it)
-+  vari=`echo $i | sed -e 's,[[-+.@]],_,g'`
-+  if test $install_it = "yes"; then
-+    TOPSUBDIRS="$TOPSUBDIRS $i"
-+    eval "$vari""_SUBDIR_included=yes"
-+  else
-+    eval "$vari""_SUBDIR_included=no"
-+  fi
-+done
-+
-+AC_SUBST(TOPSUBDIRS)
-+])
-+
-+AC_DEFUN([KDE_CHECK_NAMESPACES],
-+[
-+AC_MSG_CHECKING(whether C++ compiler supports namespaces)
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+AC_TRY_COMPILE([
-+],
-+[
-+namespace Foo {
-+  extern int i;
-+  namespace Bar {
-+    extern int i;
-+  }
-+}
-+
-+int Foo::i = 0;
-+int Foo::Bar::i = 1;
-+],[
-+  AC_MSG_RESULT(yes)
-+  AC_DEFINE(HAVE_NAMESPACES)
-+], [
-+AC_MSG_RESULT(no)
-+])
-+AC_LANG_RESTORE
-+])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure at kde.org
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([AC_CHECK_S_ISSOCK],
-+[
-+AC_MSG_CHECKING(for S_ISSOCK)
-+AC_CACHE_VAL(ac_cv_have_s_issock,
-+[
-+AC_TRY_LINK(
-+[
-+#include <sys/stat.h>
-+],
-+[
-+struct stat buff;
-+int b = S_ISSOCK( buff.st_mode );
-+],
-+ac_cv_have_s_issock=yes,
-+ac_cv_have_s_issock=no)
-+])
-+AC_MSG_RESULT($ac_cv_have_s_issock)
-+if test "$ac_cv_have_s_issock" = "yes"; then
-+  AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.])
-+fi
-+
-+AH_VERBATIM(_ISSOCK,
-+[
-+#ifndef HAVE_S_ISSOCK
-+#define HAVE_S_ISSOCK
-+#define S_ISSOCK(mode) (1==0)
-+#endif
-+])
-+
-+])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure at kde.org
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([AC_CHECK_KDEMAXPATHLEN],
-+[
-+AC_MSG_CHECKING(for MAXPATHLEN)
-+AC_CACHE_VAL(ac_cv_maxpathlen,
-+[
-+cat > conftest.$ac_ext <<EOF
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+#include <stdio.h>
-+#include <sys/param.h>
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 1024
-+#endif
-+
-+KDE_HELLO MAXPATHLEN
-+
-+EOF
-+
-+ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
-+
-+if AC_TRY_EVAL(ac_try) && test -s conftest.out; then
-+    ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
-+else
-+    ac_cv_maxpathlen=1024
-+fi
-+
-+rm conftest.*
-+
-+])
-+AC_MSG_RESULT($ac_cv_maxpathlen)
-+AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
-+])
-+
-+AC_DEFUN([KDE_CHECK_HEADER],
-+[
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+   AC_LANG_SAVE
-+   AC_LANG_CPLUSPLUS
-+   AC_CHECK_HEADER([$1], [$2], [$3], [$4])
-+   AC_LANG_RESTORE
-+   CPPFLAGS=$kde_safe_cppflags
-+])
-+
-+AC_DEFUN([KDE_CHECK_HEADERS],
-+[
-+   AH_CHECK_HEADERS([$1])
-+   AC_LANG_SAVE
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+   AC_LANG_CPLUSPLUS
-+   AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
-+   CPPFLAGS=$kde_safe_cppflags
-+   AC_LANG_RESTORE
-+])
-+
-+AC_DEFUN([KDE_FAST_CONFIGURE],
-+[
-+  dnl makes configure fast (needs perl)
-+  AC_ARG_ENABLE(fast-perl, AC_HELP_STRING([--disable-fast-perl],[disable fast Makefile generation (needs perl)]),
-+      with_fast_perl=$enableval, with_fast_perl=yes)
-+])
-+
-+AC_DEFUN([KDE_CONF_FILES],
-+[
-+  val=
-+  if test -f $srcdir/configure.files ; then
-+    val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files`
-+  fi
-+  CONF_FILES=
-+  if test -n "$val" ; then
-+    for i in $val ; do
-+      CONF_FILES="$CONF_FILES $i"
-+    done
-+  fi
-+  AC_SUBST(CONF_FILES)
-+])dnl
-+
-+dnl This sets the prefix, for arts and kdelibs
-+dnl Do NOT use in any other module.
-+dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
-+AC_DEFUN([KDE_SET_PREFIX_CORE],
-+[
-+  unset CDPATH
-+  dnl make $KDEDIR the default for the installation
-+  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
-+
-+  if test "x$prefix" = "xNONE"; then
-+    prefix=$ac_default_prefix
-+    ac_configure_args="$ac_configure_args --prefix=$prefix"
-+  fi
-+  # And delete superfluous '/' to make compares easier
-+  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+
-+  kde_libs_prefix='$(prefix)'
-+  kde_libs_htmldir='$(kde_htmldir)'
-+  AC_SUBST(kde_libs_prefix)
-+  AC_SUBST(kde_libs_htmldir)
-+  KDE_FAST_CONFIGURE
-+  KDE_CONF_FILES
-+])
-+
-+
-+AC_DEFUN([KDE_SET_PREFIX],
-+[
-+  unset CDPATH
-+  dnl We can't give real code to that macro, only a value.
-+  dnl It only matters for --help, since we set the prefix in this function anyway.
-+  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
-+
-+  KDE_SET_DEFAULT_BINDIRS
-+  if test "x$prefix" = "xNONE"; then
-+    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
-+    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
-+  else
-+    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
-+    kde_save_PATH="$PATH"
-+    PATH="$exec_prefix/bin:$prefix/bin:$PATH"
-+    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
-+    PATH="$kde_save_PATH"
-+  fi
-+
-+  kde_libs_prefix=`$KDECONFIG --prefix`
-+  if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
-+                    This means it has been moved since you installed it.
-+                    This won't work. Please recompile kdelibs for the new prefix.
-+                    ])
-+  fi
-+  kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-+
-+  AC_MSG_CHECKING([where to install])
-+  if test "x$prefix" = "xNONE"; then
-+    prefix=$kde_libs_prefix
-+    AC_MSG_RESULT([$prefix (as returned by kde-config)])
-+  else
-+    dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
-+    given_prefix=$prefix
-+    AC_MSG_RESULT([$prefix (as requested)])
-+  fi
-+
-+  # And delete superfluous '/' to make compares easier
-+  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+  given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+
-+  AC_SUBST(KDECONFIG)
-+  AC_SUBST(kde_libs_prefix)
-+  AC_SUBST(kde_libs_htmldir)
-+
-+  KDE_FAST_CONFIGURE
-+  KDE_CONF_FILES
-+])
-+
-+pushdef([AC_PROG_INSTALL],
-+[
-+  dnl our own version, testing for a -p flag
-+  popdef([AC_PROG_INSTALL])
-+  dnl as AC_PROG_INSTALL works as it works we first have
-+  dnl to save if the user didn't specify INSTALL, as the
-+  dnl autoconf one overwrites INSTALL and we have no chance to find
-+  dnl out afterwards
-+  test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
-+  test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM
-+  test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT
-+  AC_PROG_INSTALL
-+
-+  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
-+    AC_MSG_CHECKING(for -p flag to install)
-+    rm -f confinst.$$.* > /dev/null 2>&1
-+    echo "Testtest" > confinst.$$.orig
-+    ac_res=no
-+    if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then
-+      if test -f confinst.$$.new ; then
-+        # OK, -p seems to do no harm to install
-+	INSTALL="${INSTALL} -p"
-+	ac_res=yes
-+      fi
-+    fi
-+    rm -f confinst.$$.*
-+    AC_MSG_RESULT($ac_res)
-+  fi
-+  dnl the following tries to resolve some signs and wonders coming up
-+  dnl with different autoconf/automake versions
-+  dnl e.g.:
-+  dnl  *automake 1.4 install-strip sets A_M_INSTALL_PROGRAM_FLAGS to -s
-+  dnl   and has INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(A_M_INSTALL_PROGRAM_FLAGS)
-+  dnl   it header-vars.am, so there the actual INSTALL_PROGRAM gets the -s
-+  dnl  *automake 1.4a (and above) use INSTALL_STRIP_FLAG and only has
-+  dnl   INSTALL_PROGRAM = @INSTALL_PROGRAM@ there, but changes the
-+  dnl   install- at DIR@PROGRAMS targets to explicitly use that flag
-+  dnl  *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as
-+  dnl   INSTALL_SCRIPT, which breaks with automake <= 1.4
-+  dnl  *autoconf >2.13 (since 10.Apr 1999) has not that failure
-+  dnl  *sometimes KDE does not use the install- at DIR@PROGRAM targets from
-+  dnl   automake (due to broken Makefile.am or whatever) to install programs,
-+  dnl   and so does not see the -s flag in automake > 1.4
-+  dnl to clean up that mess we:
-+  dnl  +set INSTALL_PROGRAM to use INSTALL_STRIP_FLAG
-+  dnl   which cleans KDE's program with automake > 1.4;
-+  dnl  +set INSTALL_SCRIPT to only use INSTALL, to clean up autoconf's problems
-+  dnl   with automake<=1.4
-+  dnl  note that dues to this sometimes two '-s' flags are used (if KDE
-+  dnl   properly uses install- at DIR@PROGRAMS, but I don't care
-+  dnl
-+  dnl And to all this comes, that I even can't write in comments variable
-+  dnl  names used by automake, because it is so stupid to think I wanted to
-+  dnl  _use_ them, therefor I have written A_M_... instead of AM_
-+  dnl hmm, I wanted to say something ... ahh yes: Arghhh.
-+
-+  if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-+    INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)'
-+  fi
-+  if test -z "$kde_save_INSTALL_SCRIPT_given" ; then
-+    INSTALL_SCRIPT='${INSTALL}'
-+  fi
-+])dnl
-+
-+AC_DEFUN([KDE_LANG_CPLUSPLUS],
-+[AC_LANG_CPLUSPLUS
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
-+pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS])
-+])
-+
-+pushdef([AC_LANG_CPLUSPLUS],
-+[popdef([AC_LANG_CPLUSPLUS])
-+KDE_LANG_CPLUSPLUS
-+])
-+
-+AC_DEFUN([KDE_CHECK_LONG_LONG],
-+[
-+AC_MSG_CHECKING(for long long)
-+AC_CACHE_VAL(kde_cv_c_long_long,
-+[
-+  AC_LANG_SAVE
-+  AC_LANG_CPLUSPLUS
-+  AC_TRY_LINK([], [
-+  long long foo = 0;
-+  foo = foo+1;
-+  ],
-+  kde_cv_c_long_long=yes, kde_cv_c_long_long=no)
-+  AC_LANG_RESTORE
-+])
-+AC_MSG_RESULT($kde_cv_c_long_long)
-+if test "$kde_cv_c_long_long" = yes; then
-+   AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have long long as datatype])
-+fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_LIB],
-+[
-+     kde_save_LDFLAGS="$LDFLAGS"
-+     dnl AC_CHECK_LIB modifies LIBS, so save it here
-+     kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
-+     AC_CHECK_LIB($1, $2, $3, $4, $5)
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+])
-+
-+AC_DEFUN([KDE_JAVA_PREFIX],
-+[
-+	dir=`dirname "$1"`
-+	base=`basename "$1"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do 
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+])
-+
-+dnl KDE_CHEC_JAVA_DIR(onlyjre)
-+AC_DEFUN([KDE_CHECK_JAVA_DIR],
-+[
-+
-+AC_ARG_WITH(java,
-+AC_HELP_STRING([--with-java=javadir],[use java installed in javadir, --without-java disables]),
-+[  ac_java_dir=$withval
-+], ac_java_dir=""
-+)
-+
-+AC_MSG_CHECKING([for Java])
-+
-+dnl at this point ac_java_dir is either a dir, 'no' to disable, or '' to say look in $PATH
-+if test "x$ac_java_dir" = "xno"; then
-+   kde_java_bindir=no
-+   kde_java_includedir=no
-+   kde_java_libjvmdir=no
-+   kde_java_libgcjdir=no
-+   kde_java_libhpidir=no
-+else
-+  if test "x$ac_java_dir" = "x"; then
-+     
-+     
-+      dnl No option set -> collect list of candidate paths
-+      if test -n "$JAVA_HOME"; then
-+        KDE_JAVA_PREFIX($JAVA_HOME)
-+      fi
-+      KDE_JAVA_PREFIX(/usr/j2se)
-+      KDE_JAVA_PREFIX(/usr/lib/j2se)
-+      KDE_JAVA_PREFIX(/usr/j*dk*)
-+      KDE_JAVA_PREFIX(/usr/lib/j*dk*)
-+      KDE_JAVA_PREFIX(/opt/j*sdk*)
-+      KDE_JAVA_PREFIX(/usr/lib/java*)
-+      KDE_JAVA_PREFIX(/usr/java*)
-+      KDE_JAVA_PREFIX(/usr/java/j*dk*)
-+      KDE_JAVA_PREFIX(/usr/java/j*re*)
-+      KDE_JAVA_PREFIX(/usr/lib/SunJava2*)
-+      KDE_JAVA_PREFIX(/usr/lib/SunJava*)
-+      KDE_JAVA_PREFIX(/usr/lib/IBMJava2*)
-+      KDE_JAVA_PREFIX(/usr/lib/IBMJava*)
-+      KDE_JAVA_PREFIX(/opt/java*)
-+
-+      kde_cv_path="NONE"
-+      kde_save_IFS=$IFS
-+      IFS=':'
-+      for dir in $PATH; do
-+	  if test -d "$dir"; then
-+	      javadirs="$javadirs $dir"
-+	  fi
-+      done
-+      IFS=$kde_save_IFS
-+      jredirs=
-+
-+      dnl Now javadirs contains a list of paths that exist, all ending with bin/
-+      for dir in $javadirs; do
-+          dnl Check for the java executable
-+	  if test -x "$dir/java"; then
-+	      dnl And also check for a libjvm.so somewhere under there
-+	      dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
-+              if test "$dir" != "/usr/bin"; then
-+                  libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-+		  if test ! -f $libjvmdir/libjvm.so; then continue; fi
-+		  jredirs="$jredirs $dir"
-+	      fi
-+	  fi
-+      done
-+
-+      dnl Now jredirs contains a reduced list, of paths where both java and ../**/libjvm.so was found
-+      JAVAC=
-+      JAVA=
-+      kde_java_bindir=no
-+      for dir in $jredirs; do
-+	  JAVA="$dir/java"
-+	  kde_java_bindir=$dir
-+	  if test -x "$dir/javac"; then
-+		JAVAC="$dir/javac"
-+                break
-+	  fi
-+      done
-+
-+      if test -n "$JAVAC"; then
-+          dnl this substitution might not work - well, we test for jni.h below
-+          kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'`
-+      else
-+          kde_java_includedir=no
-+      fi
-+  else
-+    dnl config option set
-+    kde_java_bindir=$ac_java_dir/bin
-+    if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then
-+	kde_java_includedir=no
-+    else
-+        kde_java_includedir=$ac_java_dir/include
-+    fi
-+  fi
-+fi
-+
-+dnl At this point kde_java_bindir and kde_java_includedir are either set or "no"
-+if test "x$kde_java_bindir" != "xno"; then
-+
-+  dnl Look for libjvm.so
-+  kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-+  dnl Look for libgcj.so
-+  kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
-+  dnl Look for libhpi.so and avoid green threads
-+  kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
-+
-+  dnl Now check everything's fine under there
-+  dnl the include dir is our flag for having the JDK
-+  if test -d "$kde_java_includedir"; then
-+    if test ! -x "$kde_java_bindir/javac"; then
-+      AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.])
-+    fi
-+    if test ! -x "$kde_java_bindir/javah"; then
-+      AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-+    fi
-+    if test ! -x "$kde_java_bindir/jar"; then
-+      AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-+    fi
-+    if test ! -r "$kde_java_includedir/jni.h"; then
-+      AC_MSG_ERROR([jni.h not found under $kde_java_includedir. Use --with-java or --without-java.])
-+    fi
-+
-+    jni_includes="-I$kde_java_includedir"
-+    dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
-+    dnl and under linux here.. 
-+    
-+    dnl not needed for gcj
-+
-+    if test "x$kde_java_libgcjdir" = "x"; then 
-+      test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux"
-+      test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris"
-+      test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix"
-+    fi
-+
-+  else
-+    JAVAC=
-+    jni_includes=
-+  fi
-+
-+  if test "x$kde_java_libgcjdir" = "x"; then 
-+     if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
-+        AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
-+     fi 
-+  else
-+     if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
-+        AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.])
-+     fi 
-+  fi
-+
-+  if test ! -x "$kde_java_bindir/java"; then
-+      AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-+  fi
-+
-+  dnl not needed for gcj compile
-+
-+  if test "x$kde_java_libgcjdir" = "x"; then 
-+      if test ! -r "$kde_java_libhpidir/libhpi.so"; then
-+        AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
-+      fi
-+  fi
-+
-+  if test -n "$jni_includes"; then
-+    dnl Check for JNI version
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    ac_cxxflags_safe="$CXXFLAGS"
-+    CXXFLAGS="$CXXFLAGS $all_includes $jni_includes"
-+
-+    AC_TRY_COMPILE([
-+  #include <jni.h>
-+	      ],
-+	      [
-+  #ifndef JNI_VERSION_1_2
-+  Syntax Error
-+  #endif
-+	      ],[ kde_jni_works=yes ],
-+	      [ kde_jni_works=no ])
-+
-+    if test $kde_jni_works = no; then
-+      AC_MSG_ERROR([Incorrect version of $kde_java_includedir/jni.h.
-+		    You need to have Java Development Kit (JDK) version 1.2. 
-+
-+		    Use --with-java to specify another location.
-+		    Use --without-java to configure without java support.
-+		    Or download a newer JDK and try again. 
-+		    See e.g. http://java.sun.com/products/jdk/1.2 ])
-+    fi
-+
-+    CXXFLAGS="$ac_cxxflags_safe"    
-+    AC_LANG_RESTORE
-+
-+    dnl All tests ok, inform and subst the variables
-+
-+    JAVAC=$kde_java_bindir/javac
-+    JAVAH=$kde_java_bindir/javah
-+    JAR=$kde_java_bindir/jar
-+    AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-+    if test "x$kde_java_libgcjdir" = "x"; then 
-+      JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
-+    else
-+      JVMLIBS="-L$kde_java_libgcjdir -lgcj"
-+    fi
-+    AC_MSG_RESULT([java JDK in $kde_java_bindir])
-+
-+  else
-+      AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-+      AC_MSG_RESULT([java JRE in $kde_java_bindir])
-+  fi
-+elif test -d "/Library/Java/Home"; then
-+  kde_java_bindir="/Library/Java/Home/bin"
-+  jni_includes="-I/Library/Java/Home/include"
-+
-+  JAVAC=$kde_java_bindir/javac
-+  JAVAH=$kde_java_bindir/javah
-+  JAR=$kde_java_bindir/jar
-+  JVMLIBS="-Wl,-framework,JavaVM"
-+
-+  AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-+  AC_MSG_RESULT([Apple Java Framework])
-+else
-+  AC_MSG_RESULT([none found])
-+fi
-+
-+AC_SUBST(JAVAC)
-+AC_SUBST(JAVAH)
-+AC_SUBST(JAR)
-+AC_SUBST(JVMLIBS)
-+AC_SUBST(jni_includes)
-+
-+# for backward compat
-+kde_cv_java_includedir=$kde_java_includedir
-+kde_cv_java_bindir=$kde_java_bindir
-+])
-+
-+dnl this is a redefinition of autoconf 2.5x's AC_FOREACH.
-+dnl When the argument list becomes big, as in KDE for AC_OUTPUT in
-+dnl big packages, m4_foreach is dog-slow.  So use our own version of
-+dnl it.  (matz at kde.org)
-+m4_define([mm_foreach],
-+[m4_pushdef([$1])_mm_foreach($@)m4_popdef([$1])])
-+m4_define([mm_car], [[$1]])
-+m4_define([mm_car2], [[$@]])
-+m4_define([_mm_foreach],
-+[m4_if(m4_quote($2), [], [],
-+       [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1],
-+                                                   mm_car2(m4_shift($2)),
-+                                                   [$3])])])
-+m4_define([AC_FOREACH],
-+[mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])])
-+
-+AC_DEFUN([KDE_NEED_FLEX],
-+[
-+kde_libs_safe=$LIBS
-+LIBS="$LIBS $USER_LDFLAGS"
-+AM_PROG_LEX
-+LIBS=$kde_libs_safe
-+if test -z "$LEXLIB"; then
-+    AC_MSG_ERROR([You need to have flex installed.])
-+fi
-+AC_SUBST(LEXLIB)
-+])
-+
-+AC_DEFUN([AC_PATH_QTOPIA],
-+[
-+  dnl TODO: use AC_CACHE_VAL
-+
-+  if test -z "$1"; then
-+    qtopia_minver_maj=1
-+    qtopia_minver_min=5
-+    qtopia_minver_pat=0
-+  else
-+    qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"`
-+    qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"`
-+    qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"`
-+  fi
-+
-+  qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
-+  qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat"
-+
-+  AC_REQUIRE([AC_PATH_QT])
-+
-+  AC_MSG_CHECKING([for Qtopia])
-+
-+  LIB_QTOPIA="-lqpe"
-+  AC_SUBST(LIB_QTOPIA)
-+
-+  kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
-+
-+  ac_qtopia_incdir=NO
-+
-+  AC_ARG_WITH(qtopia-dir,
-+              AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]),
-+              [  ac_qtopia_incdir="$withval"/include] ) 
-+  
-+  qtopia_incdirs=""
-+  for dir in $kde_qtopia_dirs; do
-+    qtopia_incdirs="$qtopia_incdirs $dir/include"
-+  done
-+
-+  if test ! "$ac_qtopia_incdir" = "NO"; then
-+    qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs"
-+  fi
-+
-+  qtopia_incdir=""
-+  AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir)
-+  ac_qtopia_incdir="$qtopia_incdir"
-+
-+  if test -z "$qtopia_incdir"; then
-+    AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.])
-+  fi
-+
-+  qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`;
-+  qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`;
-+  qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`;
-+
-+  qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat"
-+  qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat"
-+  if test "$qtopia_ver" -lt "$qtopia_minver"; then
-+    AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr
-+is required.])
-+  fi
-+
-+  AC_LANG_SAVE
-+  AC_LANG_CPLUSPLUS
-+
-+  ac_cxxflags_safe="$CXXFLAGS"
-+  ac_ldflags_safe="$LDFLAGS"
-+  ac_libs_safe="$LIBS"
-+
-+  CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
-+  LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-+  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
-+
-+  cat > conftest.$ac_ext <<EOF
-+#include "confdefs.h"
-+#include <qpe/qpeapplication.h>
-+#include <qpe/version.h>
-+
-+int main( int argc, char **argv )
-+{
-+    QPEApplication app( argc, argv );
-+    return 0;
-+}
-+EOF
-+
-+  if AC_TRY_EVAL(ac_link) && test -s conftest; then
-+    rm -f conftest*
-+  else
-+    rm -f conftest*
-+    AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at
-+the end of config.log])
-+  fi
-+
-+  CXXFLAGS="$ac_cxxflags_safe"
-+  LDFLAGS="$ac_ldflags_safe"
-+  LIBS="$ac_libs_safe"
-+
-+  AC_LANG_RESTORE
-+
-+  QTOPIA_INCLUDES="-I$qtopia_incdir"
-+  AC_SUBST(QTOPIA_INCLUDES)
-+
-+  AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir])
-+])
-+
-+
-+AC_DEFUN([KDE_INIT_DOXYGEN],
-+[
-+AC_MSG_CHECKING([for Qt docs])
-+kde_qtdir=
-+if test "${with_qt_dir+set}" = set; then
-+  kde_qtdir="$with_qt_dir"
-+fi
-+
-+AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-+AC_MSG_RESULT($QTDOCDIR)
-+
-+AC_SUBST(QTDOCDIR)
-+
-+KDE_FIND_PATH(dot, DOT, [], [])
-+if test -n "$DOT"; then
-+  KDE_HAVE_DOT="YES"
-+else
-+  KDE_HAVE_DOT="NO"
-+fi
-+AC_SUBST(KDE_HAVE_DOT)
-+KDE_FIND_PATH(doxygen, DOXYGEN, [], [])
-+AC_SUBST(DOXYGEN)
-+
-+DOXYGEN_PROJECT_NAME="$1"
-+DOXYGEN_PROJECT_NUMBER="$2"
-+AC_SUBST(DOXYGEN_PROJECT_NAME)
-+AC_SUBST(DOXYGEN_PROJECT_NUMBER)
-+
-+KDE_HAS_DOXYGEN=no
-+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
-+  KDE_HAS_DOXYGEN=yes
-+fi
-+AC_SUBST(KDE_HAS_DOXYGEN)
-+
-+])
-+
-+
-+AC_DEFUN([AC_FIND_BZIP2],
-+[
-+AC_MSG_CHECKING([for bzDecompress in libbz2])
-+AC_CACHE_VAL(ac_cv_lib_bzip2,
-+[
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+kde_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET"
-+kde_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+AC_TRY_LINK(dnl
-+[
-+#define BZ_NO_STDIO
-+#include<bzlib.h>
-+],
-+            [ bz_stream s; (void) bzDecompress(&s); ],
-+            eval "ac_cv_lib_bzip2='-lbz2'",
-+            eval "ac_cv_lib_bzip2=no")
-+LIBS="$kde_save_LIBS"
-+CXXFLAGS="$kde_save_CXXFLAGS"
-+AC_LANG_RESTORE
-+])dnl
-+AC_MSG_RESULT($ac_cv_lib_bzip2)
-+
-+if test ! "$ac_cv_lib_bzip2" = no; then
-+  BZIP2DIR=bzip2
-+
-+  LIBBZ2="$ac_cv_lib_bzip2"
-+  AC_SUBST(LIBBZ2)
-+
-+else
-+
-+   cxx_shared_flag=
-+   ld_shared_flag=
-+   KDE_CHECK_COMPILER_FLAG(shared, [
-+	ld_shared_flag="-shared"
-+   ])
-+   KDE_CHECK_COMPILER_FLAG(fPIC, [
-+        cxx_shared_flag="-fPIC"
-+   ])
-+
-+   AC_MSG_CHECKING([for BZ2_bzDecompress in (shared) libbz2])
-+   AC_CACHE_VAL(ac_cv_lib_bzip2_prefix,
-+   [
-+   AC_LANG_SAVE
-+   AC_LANG_CPLUSPLUS
-+   kde_save_LIBS="$LIBS"
-+   LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET"
-+   kde_save_CXXFLAGS="$CXXFLAGS"
-+   CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES"
-+
-+   AC_TRY_LINK(dnl
-+   [
-+   #define BZ_NO_STDIO
-+   #include<bzlib.h>
-+   ],
-+               [ bz_stream s; (void) BZ2_bzDecompress(&s); ],
-+               eval "ac_cv_lib_bzip2_prefix='-lbz2'",
-+               eval "ac_cv_lib_bzip2_prefix=no")
-+   LIBS="$kde_save_LIBS"
-+   CXXFLAGS="$kde_save_CXXFLAGS"
-+   AC_LANG_RESTORE
-+   ])dnl
-+
-+   AC_MSG_RESULT($ac_cv_lib_bzip2_prefix)
-+   
-+   if test ! "$ac_cv_lib_bzip2_prefix" = no; then
-+     BZIP2DIR=bzip2
-+    
-+     LIBBZ2="$ac_cv_lib_bzip2_prefix"
-+     AC_SUBST(LIBBZ2)
-+
-+     AC_DEFINE(NEED_BZ2_PREFIX, 1, [Define if the libbz2 functions need the BZ2_ prefix])
-+   dnl else, we just ignore this
-+   fi
-+
-+fi
-+AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR")
-+])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Try to find the SSL headers and libraries.
-+dnl $(SSL_LDFLAGS) will be -Lsslliblocation (if needed)
-+dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed)
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([KDE_CHECK_SSL],
-+[
-+LIBSSL="-lssl -lcrypto"
-+AC_REQUIRE([KDE_CHECK_LIB64])
-+
-+ac_ssl_includes=NO ac_ssl_libraries=NO
-+ssl_libraries=""
-+ssl_includes=""
-+AC_ARG_WITH(ssl-dir,
-+    AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
-+    [  ac_ssl_includes="$withval"/include
-+       ac_ssl_libraries="$withval"/lib$kdelibsuff
-+    ])
-+
-+want_ssl=yes
-+AC_ARG_WITH(ssl,
-+    AC_HELP_STRING([--without-ssl],[disable SSL checks]),
-+    [want_ssl=$withval])
-+
-+if test $want_ssl = yes; then
-+
-+AC_MSG_CHECKING(for OpenSSL)
-+
-+AC_CACHE_VAL(ac_cv_have_ssl,
-+[#try to guess OpenSSL locations
-+  
-+  ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes"
-+  ssl_incdirs="$ac_ssl_includes $ssl_incdirs"
-+  AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
-+  ac_ssl_includes="$ssl_incdir"
-+
-+  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
-+  if test ! "$ac_ssl_libraries" = "NO"; then
-+    ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
-+  fi
-+
-+  test=NONE
-+  ssl_libdir=NONE
-+  for dir in $ssl_libdirs; do
-+    try="ls -1 $dir/libssl*"
-+    if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-+  done
-+
-+  ac_ssl_libraries="$ssl_libdir"
-+
-+  ac_ldflags_safe="$LDFLAGS"
-+  ac_libs_safe="$LIBS"
-+
-+  LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries"
-+  LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref"
-+
-+  AC_TRY_LINK(,void RSAPrivateEncrypt(void);RSAPrivateEncrypt();,
-+  ac_ssl_rsaref="yes"
-+  ,
-+  ac_ssl_rsaref="no"
-+  )
-+
-+  LDFLAGS="$ac_ldflags_safe"
-+  LIBS="$ac_libs_safe"
-+
-+  if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then
-+    have_ssl=no
-+  else
-+    have_ssl=yes;
-+  fi
-+
-+  ])
-+
-+  eval "$ac_cv_have_ssl"
-+
-+  AC_MSG_RESULT([libraries $ac_ssl_libraries, headers $ac_ssl_includes])
-+
-+  AC_MSG_CHECKING([whether OpenSSL uses rsaref])
-+  AC_MSG_RESULT($ac_ssl_rsaref)
-+
-+  AC_MSG_CHECKING([for easter eggs])
-+  AC_MSG_RESULT([none found])
-+
-+else
-+  have_ssl=no
-+fi
-+
-+if test "$have_ssl" = yes; then
-+  AC_MSG_CHECKING(for OpenSSL version)
-+  dnl Check for SSL version
-+  AC_CACHE_VAL(ac_cv_ssl_version,
-+  [
-+
-+    cat >conftest.$ac_ext <<EOF
-+#include <openssl/opensslv.h>
-+#include <stdio.h>
-+    int main() {
-+ 
-+#ifndef OPENSSL_VERSION_NUMBER
-+      printf("ssl_version=\\"error\\"\n");
-+#else
-+      if (OPENSSL_VERSION_NUMBER < 0x00906000)
-+        printf("ssl_version=\\"old\\"\n");
-+      else
-+        printf("ssl_version=\\"ok\\"\n");
-+#endif
-+     return (0);
-+    }
-+EOF
-+
-+    ac_save_CPPFLAGS=$CPPFLAGS
-+    if test "$ac_ssl_includes" != "/usr/include"; then
-+        CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes"
-+    fi
-+
-+    if AC_TRY_EVAL(ac_link); then 
-+
-+      if eval `./conftest 2>&5`; then
-+        if test $ssl_version = error; then
-+          AC_MSG_ERROR([$ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !])
-+        else
-+          if test $ssl_version = old; then
-+            AC_MSG_WARN([OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled.])
-+            have_ssl=no
-+          fi
-+        fi
-+        ac_cv_ssl_version="ssl_version=$ssl_version"
-+      else
-+        AC_MSG_ERROR([Your system couldn't run a small SSL test program.
-+        Check config.log, and if you can't figure it out, send a mail to 
-+        David Faure <faure at kde.org>, attaching your config.log])
-+      fi
-+
-+    else
-+      AC_MSG_ERROR([Your system couldn't link a small SSL test program.
-+      Check config.log, and if you can't figure it out, send a mail to 
-+      David Faure <faure at kde.org>, attaching your config.log])
-+    fi 
-+    CPPFLAGS=$ac_save_CPPFLAGS
-+
-+  ])
-+
-+  eval "$ac_cv_ssl_version"
-+  AC_MSG_RESULT($ssl_version)
-+fi
-+
-+if test "$have_ssl" != yes; then
-+  LIBSSL="";
-+else
-+  AC_DEFINE(HAVE_SSL, 1, [If we are going to use OpenSSL])
-+  ac_cv_have_ssl="have_ssl=yes \
-+    ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref"
-+  
-+  
-+  ssl_libraries="$ac_ssl_libraries"
-+  ssl_includes="$ac_ssl_includes"
-+
-+  if test "$ac_ssl_rsaref" = yes; then
-+    LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref" 
-+  fi
-+
-+  if test $ssl_version = "old"; then
-+    AC_DEFINE(HAVE_OLD_SSL_API, 1, [Define if you have OpenSSL < 0.9.6])
-+  fi
-+fi
-+
-+SSL_INCLUDES=
-+
-+if test "$ssl_includes" = "/usr/include"; then
-+  if test -f /usr/kerberos/include/krb5.h; then
-+	SSL_INCLUDES="-I/usr/kerberos/include"
-+  fi
-+elif test  "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then
-+  SSL_INCLUDES="-I$ssl_includes"
-+fi
-+
-+if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then
-+ SSL_LDFLAGS=""
-+else
-+ SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
-+fi
-+
-+AC_SUBST(SSL_INCLUDES)
-+AC_SUBST(SSL_LDFLAGS)
-+AC_SUBST(LIBSSL)
-+])
-+
-+AC_DEFUN([KDE_CHECK_STRLCPY],
-+[
-+  AC_REQUIRE([AC_CHECK_STRLCAT])
-+  AC_REQUIRE([AC_CHECK_STRLCPY])
-+  AC_CHECK_SIZEOF(size_t)
-+  AC_CHECK_SIZEOF(unsigned long)
-+
-+  AC_MSG_CHECKING([sizeof size_t == sizeof unsigned long])
-+  AC_TRY_COMPILE(,[
-+    #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
-+       choke me
-+    #endif
-+    ],AC_MSG_RESULT([yes]),[
-+      AC_MSG_RESULT(no)
-+      AC_MSG_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!
-+      ])
-+  ])
-+])
-+
-+AC_DEFUN([KDE_CHECK_BINUTILS],
-+[
-+  AC_MSG_CHECKING([if ld supports unversioned version maps])
-+
-+  kde_save_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
-+  echo "{ local: extern \"C++\" { foo }; };" > conftest.map
-+  AC_TRY_LINK([int foo;],
-+[
-+#ifdef __INTEL_COMPILER
-+icc apparently does not support libtools version-info and version-script
-+at the same time. Dunno where the bug is, but until somebody figured out,
-+better disable the optional version scripts.
-+#endif
-+
-+  foo = 42;
-+], kde_supports_versionmaps=yes, kde_supports_versionmaps=no)
-+  LDFLAGS="$kde_save_LDFLAGS"
-+  rm -f conftest.map
-+  AM_CONDITIONAL(include_VERSION_SCRIPT, 
-+    [test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"])
-+
-+  AC_MSG_RESULT($kde_supports_versionmaps)
-+])
-+
-+AC_DEFUN([AM_PROG_OBJC],[
-+AC_CHECK_PROGS(OBJC, gcc, gcc)
-+test -z "$OBJC" && AC_MSG_ERROR([no acceptable objective-c gcc found in \$PATH])
-+if test "x${OBJCFLAGS-unset}" = xunset; then
-+   OBJCFLAGS="-g -O2"
-+fi
-+AC_SUBST(OBJCFLAGS)
-+_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)])
-+])
-+
-+AC_DEFUN([KDE_CHECK_PERL],
-+[
-+	KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [
-+		    AC_MSG_ERROR([No Perl found in your $PATH.
-+We need perl to generate some code.])
-+	])
-+    AC_SUBST(PERL)
-+])
-+
-+AC_DEFUN([KDE_CHECK_LARGEFILE],
-+[
-+AC_SYS_LARGEFILE
-+if test "$ac_cv_sys_file_offset_bits" != no; then
-+  CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-+fi
-+
-+if test "x$ac_cv_sys_large_files" != "xno"; then
-+  CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1"
-+fi
-+
-+])
-+
-+dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in)
-+dnl which allows to search for libs that get installed into the KDE prefix.
-+dnl
-+dnl Syntax:  KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not)
-+dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
-+dnl also defines KSTUFF_PKG_ERRORS on error
-+AC_DEFUN([KDE_PKG_CHECK_MODULES], [
-+
-+   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
-+   if test "$prefix" != "$kde_libs_prefix"; then
-+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
-+   fi
-+   export PKG_CONFIG_PATH
-+   PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
-+])
-+
-+
-+dnl Check for PIE support in the compiler and linker
-+AC_DEFUN([KDE_CHECK_PIE_SUPPORT],
-+[
-+  AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support,
-+  [
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    safe_CXXFLAGS=$CXXFLAGS
-+    safe_LDFLAGS=$LDFLAGS
-+    CXXFLAGS="$CXXFLAGS -fPIE"
-+    LDFLAGS="$LDFLAGS -pie"
-+
-+    AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no])
-+
-+    CXXFLAGS=$safe_CXXFLAGS
-+    LDFLAGS=$safe_LDFLAGS
-+    AC_LANG_RESTORE
-+  ])
-+
-+  AC_MSG_CHECKING(if enabling -pie/fPIE support)
-+
-+  AC_ARG_ENABLE(pie,
-+    AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
-+      [kde_has_pie_support=$enableval],
-+      [kde_has_pie_support=detect])
-+
-+  if test "$kde_has_pie_support" = "detect"; then
-+    kde_has_pie_support=$kde_cv_val_pie_support
-+  fi
-+
-+  AC_MSG_RESULT([$kde_has_pie_support])
-+
-+  KDE_USE_FPIE=""
-+  KDE_USE_PIE=""
-+
-+  AC_SUBST([KDE_USE_FPIE])
-+  AC_SUBST([KDE_USE_PIE])
-+
-+  if test "$kde_has_pie_support" = "yes"; then
-+    KDE_USE_FPIE="-fPIE"
-+    KDE_USE_PIE="-pie"
-+  fi
-+])
-+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)
+@@ -2144,9 +2135,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],
+@@ -5970,30 +5958,15 @@
+   fi
+ ])
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
 +## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-+## Free Software Foundation, Inc.
-+## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-+##
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ ##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
 +## 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 47 AC_PROG_LIBTOOL
 +# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
-+
-+
-+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-+# -----------------------------------------------------------
-+# If this macro is not defined by Autoconf, define it here.
-+m4_ifdef([AC_PROVIDE_IFELSE],
-+         [],
-+         [m4_define([AC_PROVIDE_IFELSE],
-+	         [m4_ifdef([AC_PROVIDE_$1],
-+		           [$2], [$3])])])
-+
-+
-+# AC_PROG_LIBTOOL
-+# ---------------
-+AC_DEFUN([AC_PROG_LIBTOOL],
-+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+    [AC_LIBTOOL_CXX],
-+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-+  ])])
-+dnl And a similar setup for Fortran 77 support
-+  AC_PROVIDE_IFELSE([AC_PROG_F77],
-+    [AC_LIBTOOL_F77],
-+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-+])])
-+
-+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+    [AC_LIBTOOL_GCJ],
-+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+      [AC_LIBTOOL_GCJ],
-+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-+	[AC_LIBTOOL_GCJ],
-+      [ifdef([AC_PROG_GCJ],
-+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+       ifdef([A][M_PROG_GCJ],
-+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+       ifdef([LT_AC_PROG_GCJ],
-+	     [define([LT_AC_PROG_GCJ],
-+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-+])])# AC_PROG_LIBTOOL
-+
-+
-+# _AC_PROG_LIBTOOL
-+# ----------------
-+AC_DEFUN([_AC_PROG_LIBTOOL],
-+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+
-+# Always use our own libtool.
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -6053,7 +6026,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
 +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
-+
-+# Prevent multiple expansion
-+define([AC_PROG_LIBTOOL], [])
-+])# _AC_PROG_LIBTOOL
-+
-+
-+# AC_LIBTOOL_SETUP
-+# ----------------
-+AC_DEFUN([AC_LIBTOOL_SETUP],
-+[AC_PREREQ(2.50)dnl
-+AC_REQUIRE([AC_ENABLE_SHARED])dnl
-+AC_REQUIRE([AC_ENABLE_STATIC])dnl
-+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_LD])dnl
-+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-+AC_REQUIRE([AC_PROG_NM])dnl
-+
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-+AC_REQUIRE([AC_OBJEXT])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
-+dnl
-+
-+AC_LIBTOOL_SYS_MAX_CMD_LEN
-+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+AC_LIBTOOL_OBJDIR
-+
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+_LT_AC_PROG_ECHO_BACKSLASH
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
+ AC_SUBST(LIBTOOL)dnl
+ 
+ # Prevent multiple expansion
+@@ -6103,7 +6076,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
 +Xsed='sed -e 1s/^X//'
-+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-+
-+# Same as above, but do not quote variable references.
-+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
-+# Constants:
-+rm="rm -f"
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+ # Same as above, but do not quote variable references.
+@@ -6123,7 +6096,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
 +# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+
-+AC_CHECK_TOOL(AR, ar, false)
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+AC_CHECK_TOOL(STRIP, strip, :)
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -6143,6 +6116,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
 +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$SED" && SED=sed
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -6162,15 +6136,17 @@
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    ;;
-+  *)
+     ;;
+   *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+
+     ;;
+   esac
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
 +_LT_CC_BASENAME([$compiler])
 +
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    AC_PATH_MAGIC
-+  fi
-+  ;;
-+esac
-+
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-+enable_win32_dll=yes, enable_win32_dll=no)
-+
-+AC_ARG_ENABLE([libtool-lock],
-+    [AC_HELP_STRING([--disable-libtool-lock],
-+	[avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+AC_ARG_WITH([pic],
-+    [AC_HELP_STRING([--with-pic],
-+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+    [pic_mode="$withval"],
-+    [pic_mode=default])
-+test -z "$pic_mode" && pic_mode=default
-+
-+# Use C for the default configuration in the libtool script
-+tagname=
-+AC_LIBTOOL_LANG_C_CONFIG
-+_LT_AC_TAGCONFIG
-+])# AC_LIBTOOL_SETUP
-+
-+
-+# _LT_AC_SYS_COMPILER
-+# -------------------
-+AC_DEFUN([_LT_AC_SYS_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -6211,11 +6187,56 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 +
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+])# _LT_AC_SYS_COMPILER
-+
-+
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ ])# _LT_AC_SYS_COMPILER
+ 
+ 
 +# _LT_CC_BASENAME(CC)
 +# -------------------
 +# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
@@ -6242,306 +173,57 @@
 +])# _LT_LINKER_BOILERPLATE
 +
 +
-+# _LT_AC_SYS_LIBPATH_AIX
-+# ----------------------
-+# Links a minimal program and checks the executable
-+# for the system default hardcoded library path. In most cases,
-+# this is /usr/lib:/lib, but when the MPI compilers are used
-+# the location of the communication and MPI libs are included too.
-+# If we don't find anything, use the default library path according
-+# to the aix ld manual.
-+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi],[])
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+])# _LT_AC_SYS_LIBPATH_AIX
-+
-+
-+# _LT_AC_SHELL_INIT(ARG)
-+# ----------------------
-+AC_DEFUN([_LT_AC_SHELL_INIT],
-+[ifdef([AC_DIVERSION_NOTICE],
-+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-+	 [AC_DIVERT_PUSH(NOTICE)])
-+$1
-+AC_DIVERT_POP
-+])# _LT_AC_SHELL_INIT
-+
-+
-+# _LT_AC_PROG_ECHO_BACKSLASH
-+# --------------------------
-+# Add some code to the start of the generated configure script which
-+# will find an echo command which doesn't interpret backslashes.
-+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-+[_LT_AC_SHELL_INIT([
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+  ;;
-+esac
-+
-+echo=${ECHO-echo}
-+if test "X[$]1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X[$]1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+fi
-+
-+if test "X[$]1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+[$]*
-+EOF
-+  exit 0
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -6288,15 +6309,15 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+if test -z "$ECHO"; then
-+if test "X${echo_test_string+set}" != Xset; then
-+# find a string as large as possible, as long as the shell can cope with it
-+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
 +    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
 +       echo_test_string=`eval $cmd` &&
-+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-+    then
-+      break
-+    fi
-+  done
-+fi
-+
-+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+   test "X$echo_testing_string" = "X$echo_test_string"; then
-+  :
-+else
-+  # The Solaris, AIX, and Digital Unix default echo programs unquote
-+  # backslashes.  This makes it impossible to quote backslashes using
-+  #   echo "$something" | sed 's/\\/\\\\/g'
-+  #
-+  # So, first we look for a working echo in the user's PATH.
-+
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for dir in $PATH /usr/ucb; do
-+    IFS="$lt_save_ifs"
-+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      echo="$dir/echo"
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+
-+  if test "X$echo" = Xecho; then
-+    # We didn't find a better echo, so look for alternatives.
-+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      # This shell has a builtin print -r that does the trick.
-+      echo='print -r'
-+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-+      # If we have ksh, try running configure again with it.
-+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+      export ORIGINAL_CONFIG_SHELL
-+      CONFIG_SHELL=/bin/ksh
-+      export CONFIG_SHELL
-+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+    else
-+      # Try using printf.
-+      echo='printf %s\n'
-+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+	 test "X$echo_testing_string" = "X$echo_test_string"; then
-+	# Cool, printf works
-+	:
-+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	export CONFIG_SHELL
-+	SHELL="$CONFIG_SHELL"
-+	export SHELL
-+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-+      else
-+	# maybe with a smaller string...
-+	prev=:
-+
-+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-+	  then
-+	    break
-+	  fi
-+	  prev="$cmd"
-+	done
-+
-+	if test "$prev" != 'sed 50q "[$]0"'; then
-+	  echo_test_string=`eval $prev`
-+	  export echo_test_string
-+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-+	else
-+	  # Oops.  We lost completely, so just stick with echo.
-+	  echo=echo
-+	fi
-+      fi
-+    fi
-+  fi
-+fi
-+fi
-+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+ECHO=$echo
-+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-+fi
-+
-+AC_SUBST(ECHO)
-+])])# _LT_AC_PROG_ECHO_BACKSLASH
-+
-+
-+# _LT_AC_LOCK
-+# -----------
-+AC_DEFUN([_LT_AC_LOCK],
-+[AC_ARG_ENABLE([libtool-lock],
-+    [AC_HELP_STRING([--disable-libtool-lock],
-+	[avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *ELF-32*)
-+      HPUX_IA64_MODE="32"
-+      ;;
-+    *ELF-64*)
-+      HPUX_IA64_MODE="64"
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+   if test "$lt_cv_prog_gnu_ld" = yes; then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -melf32bsmip"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -melf32bmipn32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -melf64bmip"
-+      ;;
-+    esac
-+   else
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -32"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -n32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -64"
-+      ;;
-+    esac
-+   fi
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+@@ -6465,14 +6486,13 @@
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+-    case "`/usr/bin/file conftest.o`" in
 +    case `/usr/bin/file conftest.o` in
-+    *32-bit*)
-+      case $host in
-+        x86_64-*linux*)
-+          LD="${LD-ld} -m elf_i386"
-+          ;;
+     *32-bit*)
+-      LINUX_64_MODE="32"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
 +        ppc64-*linux*|powerpc64-*linux*)
-+          LD="${LD-ld} -m elf32ppclinux"
-+          ;;
-+        s390x-*linux*)
-+          LD="${LD-ld} -m elf_s390"
-+          ;;
-+        sparc64-*linux*)
-+          LD="${LD-ld} -m elf32_sparc"
-+          ;;
-+      esac
-+      ;;
-+    *64-bit*)
-+      case $host in
-+        x86_64-*linux*)
-+          LD="${LD-ld} -m elf_x86_64"
-+          ;;
-+        ppc*-*linux*|powerpc*-*linux*)
-+          LD="${LD-ld} -m elf64ppc"
-+          ;;
-+        s390*-*linux*)
-+          LD="${LD-ld} -m elf64_s390"
-+          ;;
-+        sparc*-*linux*)
-+          LD="${LD-ld} -m elf64_sparc"
-+          ;;
-+      esac
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+    [AC_LANG_PUSH(C)
-+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+     AC_LANG_POP])
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -6484,7 +6504,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -6518,6 +6537,22 @@
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
 +sparc*-*solaris*)
 +  # Find out which ABI we are using.
 +  echo 'int i;' > conftest.$ac_ext
@@ -6558,138 +240,63 @@
 +  rm -rf conftest*
 +  ;;
 +
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+  AC_CHECK_TOOL(AS, as, false)
-+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+  ;;
-+  ])
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+
-+])# _LT_AC_LOCK
-+
-+
-+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-+[AC_REQUIRE([LT_AC_PROG_SED])
-+AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$3"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # 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 \
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+@@ -6549,7 +6584,7 @@
+    # 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 \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -6559,8 +6594,10 @@
+    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    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
+-     if test ! -s conftest.err; then
 +     # So say no if there are warnings other than the usual output.
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
 +     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       $2=yes
-+     fi
-+   fi
-+   $rm conftest*
-+])
-+
-+if test x"[$]$2" = xyes; then
-+    ifelse([$5], , :, [$5])
-+else
-+    ifelse([$6], , :, [$6])
-+fi
-+])# AC_LIBTOOL_COMPILER_OPTION
-+
-+
-+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-+[AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $3"
-+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+        $2=yes
+      fi
+    fi
+@@ -6586,11 +6623,16 @@
+    LDFLAGS="$LDFLAGS $3"
+    printf "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
 +     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
 +       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
 +       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +       if diff conftest.exp conftest.er2 >/dev/null; then
 +         $2=yes
 +       fi
-+     else
-+       $2=yes
-+     fi
-+   fi
-+   $rm conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+])
-+
-+if test x"[$]$2" = xyes; then
-+    ifelse([$4], , :, [$4])
-+else
-+    ifelse([$5], , :, [$5])
-+fi
-+])# AC_LIBTOOL_LINKER_OPTION
-+
-+
-+# AC_LIBTOOL_SYS_MAX_CMD_LEN
-+# --------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-+[# find the maximum length of command line arguments
-+AC_MSG_CHECKING([the maximum length of command line arguments])
-+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-+  i=0
+      else
+        $2=yes
+      fi
+@@ -6614,7 +6656,7 @@
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+   i=0
+-  testring="ABCD"
 +  teststring="ABCD"
-+
-+  case $build_os in
-+  msdosdjgpp*)
-+    # On DJGPP, this test can blow up pretty badly due to problems in libc
-+    # (any single argument exceeding 2000 bytes causes a buffer overrun
-+    # during glob expansion).  Even if it were fixed, the result of this
-+    # check would be larger than it should be.
-+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-+    ;;
-+
-+  gnu*)
-+    # Under GNU Hurd, this test is not required because there is
-+    # no limit to the length of command line arguments.
-+    # Libtool will interpret -1 as no limit whatsoever
-+    lt_cv_sys_max_cmd_len=-1;
-+    ;;
-+
-+  cygwin* | mingw*)
-+    # On Win9x/ME, this test blows up -- it succeeds, but takes
-+    # about 5 minutes as the teststring grows exponentially.
-+    # Worse, since 9x/ME are not pre-emptively multitasking,
-+    # you end up with a "frozen" computer, even though with patience
-+    # the test eventually succeeds (with a max line length of 256k).
-+    # Instead, let's just punt: use the minimum linelength reported by
-+    # all of the supported platforms: 8192 (on NT/2K/XP).
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -6643,20 +6685,70 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
 +  amigaos*)
 +    # On AmigaOS with pdksh, this test takes hours, literally.
 +    # So we just punt and use a minimum line length of 8192.
@@ -6740,429 +347,183 @@
 +    fi
 +    ;;
 +  *)
-+    # If test is not a shell built-in, we'll probably end up computing a
-+    # maximum length that is only half of the actual maximum length, but
-+    # we can't tell.
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
 +    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
 +    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 +	       = "XX$teststring") >/dev/null 2>&1 &&
 +	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+	    lt_cv_sys_max_cmd_len=$new_result &&
-+	    test $i != 17 # 1/2 MB should be enough
-+    do
-+      i=`expr $i + 1`
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
 +      teststring=$teststring$teststring
-+    done
+     done
+-    testring=
 +    teststring=
-+    # Add a significant safety factor because C++ compilers can tack on massive
-+    # amounts of additional arguments before passing them to the linker.
-+    # It appears as though 1/2 is a usable value.
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+    ;;
-+  esac
-+])
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-+else
-+  AC_MSG_RESULT(none)
-+fi
-+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-+
-+
-+# _LT_AC_CHECK_DLFCN
+     # 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.
+@@ -6673,7 +6765,7 @@
+ 
+ 
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
 +# ------------------
-+AC_DEFUN([_LT_AC_CHECK_DLFCN],
-+[AC_CHECK_HEADERS(dlfcn.h)dnl
-+])# _LT_AC_CHECK_DLFCN
-+
-+
-+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -6681,7 +6773,7 @@
+ 
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
 +# ---------------------------------------------------------------------
-+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+if test "$cross_compiling" = yes; then :
-+  [$4]
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+[#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    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
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+@@ -6747,17 +6839,19 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
 +  else
 +    puts (dlerror ());
-+
-+    exit (status);
-+}]
-+EOF
-+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ 
+     exit (status);
+ }]
+ EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
 +    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) $1 ;;
-+      x$lt_dlneed_uscore) $2 ;;
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) $1 ;;
+       x$lt_dlneed_uscore) $2 ;;
+-      x$lt_unknown|x*) $3 ;;
 +      x$lt_dlunknown|x*) $3 ;;
-+    esac
-+  else :
-+    # compilation failed
-+    $3
-+  fi
-+fi
-+rm -fr conftest*
-+])# _LT_AC_TRY_DLOPEN_SELF
-+
-+
-+# AC_LIBTOOL_DLOPEN_SELF
+     esac
+   else :
+     # compilation failed
+@@ -6769,7 +6863,7 @@
+ 
+ 
+ # AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
 +# ----------------------
-+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+@@ -6806,7 +6900,7 @@
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+-    
 +
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  darwin*)
-+  # if libdl is installed we need to link against it
-+    AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ])
-+   ;;
-+
-+  *)
-+    AC_CHECK_FUNC([shl_load],
-+	  [lt_cv_dlopen="shl_load"],
-+      [AC_CHECK_LIB([dld], [shl_load],
-+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-+	[AC_CHECK_FUNC([dlopen],
-+	      [lt_cv_dlopen="dlopen"],
-+	  [AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+	    [AC_CHECK_LIB([svld], [dlopen],
-+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+	      [AC_CHECK_LIB([dld], [dld_link],
-+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+	      ])
-+	    ])
-+	  ])
-+	])
-+      ])
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+@@ -6840,7 +6934,7 @@
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 +    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+    AC_CACHE_CHECK([whether a program can dlopen itself],
-+	  lt_cv_dlopen_self, [dnl
-+	  _LT_AC_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+    ])
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
+ 
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -6853,7 +6947,7 @@
+     ])
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
 +      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-+    	  lt_cv_dlopen_self_static, [dnl
-+	  _LT_AC_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-+      ])
-+    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
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+])# AC_LIBTOOL_DLOPEN_SELF
-+
-+
-+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-+# ---------------------------------
-+# Check to see if options -c and -o are simultaneously supported by compiler
-+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-+   $rm -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
+       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+     	  lt_cv_dlopen_self_static, [dnl
+ 	  _LT_AC_TRY_DLOPEN_SELF(
+@@ -6895,20 +6989,13 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+   then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -6920,13 +7007,18 @@
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
 +     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
 +     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+     fi
-+   fi
+        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
 +   chmod u+w . 2>&AS_MESSAGE_LOG_FD
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
 +   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
 +   $rm out/* && rmdir out
-+   cd ..
-+   rmdir conftest
-+   $rm conftest*
-+])
-+])# AC_LIBTOOL_PROG_CC_C_O
-+
-+
-+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-+# -----------------------------------------
-+# Check to see if we can do hard links to lock some files if needed
-+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-+[AC_REQUIRE([_LT_AC_LOCK])dnl
-+
-+hard_links="nottested"
-+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  AC_MSG_CHECKING([if we can lock with hard links])
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  AC_MSG_RESULT([$hard_links])
-+  if test "$hard_links" = no; then
-+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-+
-+
-+# AC_LIBTOOL_OBJDIR
-+# -----------------
-+AC_DEFUN([AC_LIBTOOL_OBJDIR],
-+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-+[rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  lt_cv_objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null])
-+objdir=$lt_cv_objdir
-+])# AC_LIBTOOL_OBJDIR
-+
-+
-+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-+# ----------------------------------------------
-+# Check hardcoding attributes.
-+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-+[AC_MSG_CHECKING([how to hardcode library paths into programs])
-+_LT_AC_TAGVAR(hardcode_action, $1)=
-+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+    cd ..
+    rmdir conftest
+    $rm conftest*
+@@ -6985,8 +7077,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
 +   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
 +   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-+fi
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-+
-+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-+
-+
-+# AC_LIBTOOL_SYS_LIB_STRIP
-+# ------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-+[striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  AC_MSG_RESULT([yes])
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
-+   darwin*)
-+       if test -n "$STRIP" ; then
-+         striplib="$STRIP -x"
-+         AC_MSG_RESULT([yes])
-+       else
-+  AC_MSG_RESULT([no])
-+fi
-+       ;;
-+   *)
-+  AC_MSG_RESULT([no])
-+    ;;
+ 
+   # We can hardcode non-existant directories.
+   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -7043,7 +7135,7 @@
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+-  esac  
 +  esac
-+fi
-+])# AC_LIBTOOL_SYS_LIB_STRIP
-+
-+
-+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-+# -----------------------------
-+# PORTME Fill in your ld.so characteristics
-+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-+[AC_MSG_CHECKING([dynamic linker characteristics])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+@@ -7056,7 +7148,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
 +shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -7066,7 +7158,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +if test "$GCC" = yes; then
 +  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 +  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
@@ -7177,184 +538,82 @@
 +else
 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[[01]] | aix4.[[01]].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-+      ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -7131,7 +7236,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
 +  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
+   ;;
+ 
+ beos*)
+@@ -7140,7 +7245,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
 +bsdi[[45]]*)
-+  version_type=linux
-+  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 $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -7156,7 +7261,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
 +  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
-+
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -7168,7 +7273,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
 +      $install_prog $dir/$dlname \$dldir/$dlname~
 +      chmod a+x \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-+    mingw*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -7198,7 +7304,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 +      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    esac
-+    ;;
-+
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
+       ;;
+     esac
+     ;;
+@@ -7221,7 +7327,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+  if test "$GCC" = yes; then
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+  else
-+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
-+
-+dgux*)
-+  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
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
+   # 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"`
+@@ -7244,20 +7350,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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='GNU ld.so'
+-  ;;
+-
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
@@ -7366,95 +625,65 @@
 +    *) objformat=elf ;;
 +    esac
 +  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -7275,14 +7378,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
 +  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
 +  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
 +  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
 +  freebsd*) # from 4.6 on
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
-+  esac
-+  ;;
-+
-+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
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
+   esac
+   ;;
+ 
+@@ -7302,9 +7410,9 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  case "$host_cpu" in
 +  case $host_cpu in
-+  ia64*)
+   ia64*)
+-    shrext='.so'
 +    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+   hppa*64*)
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -7319,7 +7427,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
 +     shrext_cmds='.sl'
-+     hardcode_into_libs=yes
-+     dynamic_linker="$host_os dld.sl"
-+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+     soname_spec='${libname}${release}${shared_ext}$major'
-+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+     ;;
-+   *)
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -7330,7 +7438,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
 +    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    ;;
-+  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -7342,6 +7450,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
 +interix3*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -7467,78 +696,50 @@
 +  hardcode_into_libs=yes
 +  ;;
 +
-+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.
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -7385,29 +7505,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'
-+  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
-+
+   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'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+   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
+ 
 +  # 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,
-+  # 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'
-+  ;;
-+
+   # 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,
+@@ -7417,6 +7534,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -7551,145 +752,69 @@
 +  dynamic_linker='NetBSD ld.elf_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
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -7426,7 +7555,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}'
 +    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
-+  ;;
-+
-+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
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -7454,8 +7583,13 @@
+ 
+ openbsd*)
+   version_type=sunos
 +  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
+   need_lib_prefix=no
+-  need_version=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
-+  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'
+   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
+@@ -7475,7 +7609,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
 +  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*)
-+  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"
-+  ;;
-+
-+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'
-+  ;;
-+
-+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
-+  ;;
-+
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -7493,13 +7627,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  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
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -7525,7 +7652,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +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
-+  ;;
-+
-+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
-+  ;;
-+
+   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'
+@@ -7558,6 +7685,29 @@
+   fi
+   ;;
+ 
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -7713,484 +838,91 @@
 +  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
-+  ;;
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -7571,6 +7721,11 @@
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
 +
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+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
-+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-+
-+
-+# _LT_AC_TAGCONFIG
-+# ----------------
-+AC_DEFUN([_LT_AC_TAGCONFIG],
-+[AC_ARG_WITH([tags],
-+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-+        [include additional configurations @<:@automatic@:>@])],
-+    [tagnames="$withval"])
-+
-+if test -f "$ltmain" && test -n "$tagnames"; then
-+  if test ! -f "${ofile}"; then
-+    AC_MSG_WARN([output file `$ofile' does not exist])
-+  fi
-+
-+  if test -z "$LTCC"; then
-+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-+    if test -z "$LTCC"; then
-+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-+    else
-+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-+    fi
-+  fi
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ 
+ 
+@@ -7595,6 +7750,9 @@
+       AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+     fi
+   fi
 +  if test -z "$LTCFLAGS"; then
 +    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
 +  fi
-+
-+  # Extract list of available tagged configurations in $ofile.
-+  # Note that this assumes the entire list is on one line.
-+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-+
-+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+  for tagname in $tagnames; do
-+    IFS="$lt_save_ifs"
-+    # Check whether tagname contains only valid characters
-+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-+    "") ;;
-+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-+	;;
-+    esac
-+
-+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-+    then
-+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-+    fi
-+
-+    # Update the list of available tags.
-+    if test -n "$tagname"; then
-+      echo appending configuration tag \"$tagname\" to $ofile
-+
-+      case $tagname in
-+      CXX)
+ 
+   # Extract list of available tagged configurations in $ofile.
+   # Note that this assumes the entire list is on one line.
+@@ -7621,7 +7779,9 @@
+ 
+       case $tagname in
+       CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
 +	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 +	    (test "X$CXX" != "Xg++"))) ; then
-+	  AC_LIBTOOL_LANG_CXX_CONFIG
-+	else
-+	  tagname=""
-+	fi
-+	;;
-+
-+      F77)
-+	if test -n "$F77" && test "X$F77" != "Xno"; then
-+	  AC_LIBTOOL_LANG_F77_CONFIG
-+	else
-+	  tagname=""
-+	fi
-+	;;
-+
-+      GCJ)
-+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-+	  AC_LIBTOOL_LANG_GCJ_CONFIG
-+	else
-+	  tagname=""
-+	fi
-+	;;
-+
-+      RC)
-+	AC_LIBTOOL_LANG_RC_CONFIG
-+	;;
-+
-+      *)
-+	AC_MSG_ERROR([Unsupported tag name: $tagname])
-+	;;
-+      esac
-+
-+      # Append the new tag name to the list of available tags.
-+      if test -n "$tagname" ; then
-+      available_tags="$available_tags $tagname"
-+    fi
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+
-+  # Now substitute the updated list of available tags.
-+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-+    mv "${ofile}T" "$ofile"
-+    chmod +x "$ofile"
-+  else
-+    rm -f "${ofile}T"
-+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-+  fi
-+fi
-+])# _LT_AC_TAGCONFIG
-+
-+
-+# AC_LIBTOOL_DLOPEN
-+# -----------------
-+# enable checks for dlopen support
-+AC_DEFUN([AC_LIBTOOL_DLOPEN],
-+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_DLOPEN
-+
-+
-+# AC_LIBTOOL_WIN32_DLL
-+# --------------------
+ 	  AC_LIBTOOL_LANG_CXX_CONFIG
+ 	else
+ 	  tagname=""
+@@ -7683,7 +7843,7 @@
+ 
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
 +# declare package support for building win32 DLLs
-+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_WIN32_DLL
-+
-+
-+# AC_ENABLE_SHARED([DEFAULT])
-+# ---------------------------
-+# implement the --enable-shared flag
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([shared],
-+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
-+    *)
-+      enable_shared=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-+])# AC_ENABLE_SHARED
-+
-+
-+# AC_DISABLE_SHARED
-+# -----------------
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -7721,7 +7881,7 @@
+ 
+ # AC_DISABLE_SHARED
+ # -----------------
+-#- set the default shared flag to --disable-shared
 +# set the default shared flag to --disable-shared
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_SHARED(no)
-+])# AC_DISABLE_SHARED
-+
-+
-+# AC_ENABLE_STATIC([DEFAULT])
-+# ---------------------------
-+# implement the --enable-static flag
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([static],
-+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_static=yes ;;
-+    no) enable_static=no ;;
-+    *)
-+     enable_static=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_static=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-+])# AC_ENABLE_STATIC
-+
-+
-+# AC_DISABLE_STATIC
-+# -----------------
-+# set the default static flag to --disable-static
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_STATIC(no)
-+])# AC_DISABLE_STATIC
-+
-+
-+# AC_ENABLE_FAST_INSTALL([DEFAULT])
-+# ---------------------------------
-+# implement the --enable-fast-install flag
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([fast-install],
-+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_fast_install=yes ;;
-+    no) enable_fast_install=no ;;
-+    *)
-+      enable_fast_install=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_fast_install=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-+])# AC_ENABLE_FAST_INSTALL
-+
-+
-+# AC_DISABLE_FAST_INSTALL
-+# -----------------------
-+# set the default to --disable-fast-install
-+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_FAST_INSTALL(no)
-+])# AC_DISABLE_FAST_INSTALL
-+
-+
-+# AC_LIBTOOL_PICMODE([MODE])
-+# --------------------------
-+# implement the --with-pic flag
-+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-+AC_DEFUN([AC_LIBTOOL_PICMODE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+pic_mode=ifelse($#,1,$1,default)
-+])# AC_LIBTOOL_PICMODE
-+
-+
-+# AC_PROG_EGREP
-+# -------------
-+# This is predefined starting with Autoconf 2.54, so this conditional
-+# definition can be removed once we require Autoconf 2.54 or later.
-+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-+    then ac_cv_prog_egrep='grep -E'
-+    else ac_cv_prog_egrep='egrep'
-+    fi])
-+ EGREP=$ac_cv_prog_egrep
-+ AC_SUBST([EGREP])
-+])])
-+
-+
-+# AC_PATH_TOOL_PREFIX
-+# -------------------
-+# find a file program which can recognise shared library
-+AC_DEFUN([AC_PATH_TOOL_PREFIX],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+[[\\/*] |  ?:[\\/]*])
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word.  This closes a longstanding sh security hole.
-+  ac_dummy="ifelse([$2], , $PATH, [$2])"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$1; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+@@ -7857,7 +8017,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
 +	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  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
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool at gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  AC_MSG_RESULT($MAGIC_CMD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+])# AC_PATH_TOOL_PREFIX
-+
-+
-+# AC_PATH_MAGIC
-+# -------------
-+# find a file program which can recognise a shared library
-+AC_DEFUN([AC_PATH_MAGIC],
-+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+])# AC_PATH_MAGIC
-+
-+
-+# AC_PROG_LD
-+# ----------
-+# find the pathname to the GNU or non-GNU linker
-+AC_DEFUN([AC_PROG_LD],
-+[AC_ARG_WITH([gnu-ld],
-+    [AC_HELP_STRING([--with-gnu-ld],
-+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-+    [test "$withval" = no || with_gnu_ld=yes],
-+    [with_gnu_ld=no])
-+AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  AC_MSG_CHECKING([for ld used by $CC])
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [[\\/]]* | ?:[[\\/]]*)
-+      re_direlt='/[[^/]][[^/]]*/\.\./'
-+      # Canonicalize the pathname of ld
-+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  AC_MSG_CHECKING([for GNU ld])
-+else
-+  AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    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,
+ 	  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
+@@ -7967,7 +8127,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,
+-      # but apparently some GNU ld's only accept -v.
 +      # but apparently some variants of GNU ld only accept -v.
-+      # 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'*)
-+	test "$with_gnu_ld" != no && break
-+	;;
-+      *)
-+	test "$with_gnu_ld" != yes && break
-+	;;
-+      esac
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  AC_MSG_RESULT($LD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_PROG_LD_GNU
-+])# AC_PROG_LD
-+
-+
-+# AC_PROG_LD_GNU
-+# --------------
-+AC_DEFUN([AC_PROG_LD_GNU],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+       # 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'*)
+@@ -7999,7 +8159,7 @@
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 +[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+  lt_cv_prog_gnu_ld=yes
-+  ;;
-+*)
-+  lt_cv_prog_gnu_ld=no
-+  ;;
-+esac])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])# AC_PROG_LD_GNU
-+
-+
-+# AC_PROG_LD_RELOAD_FLAG
-+# ----------------------
-+# find reload flag for linker
-+#   -- PORTME Some linkers may need a different reload flag.
-+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-+[AC_CACHE_CHECK([for $LD option to reload object files],
-+  lt_cv_ld_reload_flag,
-+  [lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -8026,6 +8186,15 @@
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
 +case $host_os in
 +  darwin*)
 +    if test "$GCC" = yes; then
@@ -8200,201 +932,205 @@
 +    fi
 +    ;;
 +esac
-+])# AC_PROG_LD_RELOAD_FLAG
-+
-+
-+# AC_DEPLIBS_CHECK_METHOD
-+# -----------------------
-+# how to check for library dependencies
-+#  -- PORTME fill in with the dynamic library characteristics
-+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-+[AC_CACHE_CHECK([how to recognise dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
+ ])# AC_PROG_LD_RELOAD_FLAG
+ 
+ 
+@@ -8059,44 +8228,36 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-bsdi4*)
 +bsdi[[45]]*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
-+
-+cygwin*)
+   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+ cygwin*)
+-  lt_cv_deplibs_check_method=pass_all
 +  # func_win32_libid is a shell function defined in ltmain.sh
 +  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 +  lt_cv_file_magic_cmd='func_win32_libid'
-+  ;;
+   ;;
+-  
 +
-+mingw* | pw32*)
+ mingw* | pw32*)
+-  # win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='win32_libid'
 +  # Base MSYS/MinGW do not provide the 'file' command needed by
 +  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
 +  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
 +  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
+   ;;
+ 
+ darwin* | rhapsody*)
+-  # this will be overwritten by pass_all, but leave it in just in case
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[[012]])
+-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+-    ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+-    ;;
+-  esac
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu)
 +freebsd* | dragonfly*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
 +      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20* | hpux11*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -8112,7 +8273,7 @@
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
 +  case $host_cpu in
-+  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
-+    ;;
-+  hppa*64*)
-+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+    ;;
-+  *)
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+    ;;
-+  esac
-+  ;;
-+
+   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
+@@ -8128,43 +8289,27 @@
+   esac
+   ;;
+ 
 +interix3*)
 +  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
 +  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
 +  ;;
 +
-+irix5* | irix6* | nonstopux*)
+ irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case $LD in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+-    ;;
 +  case $LD in
 +  *-32|*"-32 ") libmagic=32-bit;;
 +  *-n32|*"-n32 ") libmagic=N32;;
 +  *-64|*"-64 ") libmagic=64-bit;;
 +  *) libmagic=never-match;;
-+  esac
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
+-  case $host_cpu in
+-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+-  arm* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
 +linux* | k*bsd*-gnu)
 +  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
+   ;;
+ 
+-netbsd*)
 +netbsd* | netbsdelf*-gnu)
-+  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
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+nto-qnx*)
-+  lt_cv_deplibs_check_method=unknown
-+  ;;
-+
-+openbsd*)
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+   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
+@@ -8183,32 +8328,22 @@
+   ;;
+ 
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
 +    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-+  else
+   else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
 +    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
+   fi
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-sco3.2v5*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +sysv4 | sysv4.3*)
-+  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]]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
+   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]]'
+@@ -8229,10 +8364,13 @@
+   siemens)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
 +  pc)
 +    lt_cv_deplibs_check_method=pass_all
 +    ;;
-+  esac
-+  ;;
-+
+   esac
+   ;;
+ 
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+esac
-+])
-+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
-+])# AC_DEPLIBS_CHECK_METHOD
-+
-+
-+# AC_PROG_NM
-+# ----------
-+# find the pathname to a BSD-compatible name lister
-+AC_DEFUN([AC_PROG_NM],
-+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-+[if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+@@ -8252,36 +8390,43 @@
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-      */dev/null* | *'Invalid file or object type'*)
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-        ;;
+-      *)
+-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null*)
+-	  lt_cv_path_NM="$tmp_nm -p"
 +  lt_nm_to_check="${ac_tool_prefix}nm"
 +  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
 +    lt_nm_to_check="$lt_nm_to_check nm"
@@ -8413,9 +1149,11 @@
 +	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
 +	*/dev/null* | *'Invalid file or object type'*)
 +	  lt_cv_path_NM="$tmp_nm -B"
-+	  break
-+	  ;;
-+	*)
+ 	  break
+ 	  ;;
+ 	*)
+-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	  continue # so that we can try to find one that supports BSD flags
 +	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 +	  */dev/null*)
 +	    lt_cv_path_NM="$tmp_nm -p"
@@ -8426,43 +1164,29 @@
 +	    continue # so that we can try to find one that supports BSD flags
 +	    ;;
 +	  esac
-+	  ;;
-+	esac
+ 	  ;;
+ 	esac
+-      esac
+-    fi
 +      fi
 +    done
 +    IFS="$lt_save_ifs"
-+  done
-+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+fi])
-+NM="$lt_cv_path_NM"
-+])# AC_PROG_NM
-+
-+
-+# AC_CHECK_LIBM
-+# -------------
-+# check for math library
-+AC_DEFUN([AC_CHECK_LIBM],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+  # These system don't have libm, or don't need it
-+  ;;
-+*-ncr-sysv4.3*)
-+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-+  ;;
-+*)
-+  AC_CHECK_LIB(m, cos, LIBM="-lm")
-+  ;;
-+esac
-+])# AC_CHECK_LIBM
-+
-+
-+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-+# -----------------------------------
-+# sets LIBLTDL to the link flags for the libltdl convenience library and
-+# LTDLINCL to the include flags for the libltdl header and adds
+   done
+-  IFS="$lt_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+@@ -8313,13 +8458,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
 +# --enable-ltdl-convenience to the configure arguments.  Note that
 +# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
 +# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
@@ -8470,24 +1194,20 @@
 +# (note the single quotes!).  If your package is not flat and you're not
 +# using automake, define top_builddir and top_srcdir appropriately in
 +# the Makefiles.
-+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  case $enable_ltdl_convenience in
-+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-+  "") enable_ltdl_convenience=yes
-+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-+  esac
-+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+  # For backwards non-gettext consistent compatibility...
-+  INCLTDL="$LTDLINCL"
-+])# AC_LIBLTDL_CONVENIENCE
-+
-+
-+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-+# -----------------------------------
-+# sets LIBLTDL to the link flags for the libltdl installable library and
-+# LTDLINCL to the include flags for the libltdl header and adds
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   case $enable_ltdl_convenience in
+@@ -8338,13 +8483,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!).  If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
 +# --enable-ltdl-install to the configure arguments.  Note that
 +# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
 +# and an installed libltdl is not found, it is assumed to be `libltdl'.
@@ -8495,47 +1215,18 @@
 +# '${top_srcdir}/' (note the single quotes!).  If your package is not
 +# flat and you're not using automake, define top_builddir and top_srcdir
 +# appropriately in the Makefiles.
-+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  AC_CHECK_LIB(ltdl, lt_dlinit,
-+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-+  [if test x"$enable_ltdl_install" = xno; then
-+     AC_MSG_WARN([libltdl not installed, but installation disabled])
-+   else
-+     enable_ltdl_install=yes
-+   fi
-+  ])
-+  if test x"$enable_ltdl_install" = x"yes"; then
-+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+  else
-+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-+    LIBLTDL="-lltdl"
-+    LTDLINCL=
-+  fi
-+  # For backwards non-gettext consistent compatibility...
-+  INCLTDL="$LTDLINCL"
-+])# AC_LIBLTDL_INSTALLABLE
-+
-+
-+# AC_LIBTOOL_CXX
-+# --------------
-+# enable support for C++ libraries
-+AC_DEFUN([AC_LIBTOOL_CXX],
-+[AC_REQUIRE([_LT_AC_LANG_CXX])
-+])# AC_LIBTOOL_CXX
-+
-+
-+# _LT_AC_LANG_CXX
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_CXX],
-+[AC_REQUIRE([AC_PROG_CXX])
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -8382,10 +8527,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
 +AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-+])# _LT_AC_LANG_CXX
-+
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+ 
 +# _LT_AC_PROG_CXXCPP
 +# ------------------
 +AC_DEFUN([_LT_AC_PROG_CXXCPP],
@@ -8547,289 +1238,222 @@
 +  AC_PROG_CXXCPP
 +fi
 +])# _LT_AC_PROG_CXXCPP
-+
-+# AC_LIBTOOL_F77
-+# --------------
-+# enable support for Fortran 77 libraries
-+AC_DEFUN([AC_LIBTOOL_F77],
-+[AC_REQUIRE([_LT_AC_LANG_F77])
-+])# AC_LIBTOOL_F77
-+
-+
-+# _LT_AC_LANG_F77
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_F77],
-+[AC_REQUIRE([AC_PROG_F77])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-+])# _LT_AC_LANG_F77
-+
-+
-+# AC_LIBTOOL_GCJ
-+# --------------
-+# enable support for GCJ libraries
-+AC_DEFUN([AC_LIBTOOL_GCJ],
-+[AC_REQUIRE([_LT_AC_LANG_GCJ])
-+])# AC_LIBTOOL_GCJ
-+
-+
-+# _LT_AC_LANG_GCJ
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_GCJ],
-+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-+	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-+	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-+])# _LT_AC_LANG_GCJ
-+
-+
-+# AC_LIBTOOL_RC
+ 
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -8425,7 +8581,7 @@
+ 
+ 
+ # AC_LIBTOOL_RC
+-# --------------
 +# -------------
-+# enable support for Windows resource files
-+AC_DEFUN([AC_LIBTOOL_RC],
-+[AC_REQUIRE([LT_AC_PROG_RC])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-+])# AC_LIBTOOL_RC
-+
-+
-+# AC_LIBTOOL_LANG_C_CONFIG
-+# ------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-+[lt_save_CC="$CC"
-+AC_LANG_PUSH(C)
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}\n'
-+
-+_LT_AC_SYS_COMPILER
-+
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -8458,36 +8614,9 @@
+ 
+ _LT_AC_SYS_COMPILER
+ 
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+-  case $host_os in
+-  sco3.2v5*)
+-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+-    ;;
+-  esac
+-fi
+-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
+-  else
+-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+-  fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
 +# save warnings/boilerplate of simple test code
 +_LT_COMPILER_BOILERPLATE
 +_LT_LINKER_BOILERPLATE
-+
-+## 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
-+## what you are doing...
-+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+AC_LIBTOOL_SYS_LIB_STRIP
+ 
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -8501,9 +8630,9 @@
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
 +AC_LIBTOOL_DLOPEN_SELF
-+
+ 
+-# Report which librarie types wil actually be built
 +# Report which library types will actually be built
-+AC_MSG_CHECKING([if libtool supports shared libraries])
-+AC_MSG_RESULT([$can_build_shared])
-+
-+AC_MSG_CHECKING([whether to build shared libraries])
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+ 
+@@ -8512,7 +8641,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
 +case $host_os in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -8521,48 +8650,11 @@
+   fi
+   ;;
+ 
+-aix4*)
 +aix4* | aix5*)
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+-  ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.[012])
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi  
+-    ;;  
 +    ;;
-+esac
-+AC_MSG_RESULT([$enable_shared])
-+
-+AC_MSG_CHECKING([whether to build static libraries])
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+AC_MSG_RESULT([$enable_static])
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_C_CONFIG
-+
-+
-+# AC_LIBTOOL_LANG_CXX_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-+[AC_LANG_PUSH(C++)
-+AC_REQUIRE([AC_PROG_CXX])
+ esac
+ AC_MSG_RESULT([$enable_shared])
+ 
+@@ -8587,7 +8679,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
 +AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-+
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+_LT_AC_TAGVAR(always_export_symbols, $1)=no
-+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_direct, $1)=no
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+ 
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -8599,6 +8691,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
 +_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+_LT_AC_TAGVAR(module_cmds, $1)=
-+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_AC_TAGVAR(no_undefined_flag, $1)=
-+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Dependencies to place before and after the object being linked:
-+_LT_AC_TAGVAR(predep_objects, $1)=
-+_LT_AC_TAGVAR(postdep_objects, $1)=
-+_LT_AC_TAGVAR(predeps, $1)=
-+_LT_AC_TAGVAR(postdeps, $1)=
-+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-+
-+# Source file extension for C++ test sources.
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+@@ -8616,7 +8709,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
 +ac_ext=cpp
-+
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
-+# Code to be used in simple link tests
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -8626,11 +8719,15 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
 +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
 +# save warnings/boilerplate of simple test code
 +_LT_COMPILER_BOILERPLATE
 +_LT_LINKER_BOILERPLATE
 +
-+# Allow CC to be a program name with arguments.
-+lt_save_CC=$CC
-+lt_save_LD=$LD
-+lt_save_GCC=$GCC
-+GCC=$GXX
-+lt_save_with_gnu_ld=$with_gnu_ld
-+lt_save_path_LD=$lt_cv_path_LD
-+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-+else
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -8641,18 +8738,18 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+-  unset lt_cv_prog_gnu_ld
 +  $as_unset lt_cv_prog_gnu_ld
-+fi
-+if test -n "${lt_cv_path_LDCXX+set}"; then
-+  lt_cv_path_LD=$lt_cv_path_LDCXX
-+else
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+   lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+-  unset lt_cv_path_LD
 +  $as_unset lt_cv_path_LD
-+fi
-+test -z "${LDCXX+set}" || LD=$LDCXX
-+CC=${CXX-"c++"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
 +_LT_CC_BASENAME([$compiler])
-+
-+# We don't want -fno-exception wen compiling C++ code, so set the
-+# no_builtin_flag separately
-+if test "$GXX" = yes; then
-+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+else
-+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+fi
-+
-+if test "$GXX" = yes; then
-+  # Set up default GNU C++ configuration
-+
-+  AC_PROG_LD
-+
-+  # 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
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -8670,8 +8767,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
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-+    #     investigate it a little bit more. (MM)
-+    wlarc='${wl}'
-+
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-+	grep 'no-whole-archive' > /dev/null; then
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+  else
-+    with_gnu_ld=no
-+    wlarc=
-+
-+    # A generic and very simple default shared library creation
-+    # command for GNU C++ for the case where it uses the native
-+    # 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.
+ 
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -8697,7 +8794,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.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
 +    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+  fi
-+
-+  # Commands to make compiler produce verbose output that lists
-+  # what "hidden" libraries, object files and flags are used when
-+  # linking a shared library.
-+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+else
-+  GXX=no
-+  with_gnu_ld=no
-+  wlarc=
-+fi
-+
-+# PORTME: fill in a description of your system's C++ link characteristics
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+case $host_os in
-+  aix3*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  aix4* | aix5*)
-+    if test "$host_cpu" = ia64; then
-+      # On IA64, the linker does run time linking by default, so we don't
-+      # have to do anything special.
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists
+@@ -8727,8 +8824,23 @@
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+     else
+-      # KDE requires run time linking.  Make it the default.
+-      aix_use_runtimelinking=yes
 +      aix_use_runtimelinking=no
-+      exp_sym_flag='-Bexport'
-+      no_entry_flag=""
-+    else
-+      aix_use_runtimelinking=no
 +
 +      # Test if we are trying to use run time linking or normal
 +      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -8846,95 +1470,91 @@
 +	;;
 +      esac
 +
-+      exp_sym_flag='-bexport'
-+      no_entry_flag='-bnoentry'
-+    fi
-+
-+    # When large executables or shared objects are built, AIX ld can
-+    # have problems creating the table of contents.  If linking a library
-+    # or program results in "error TOC overflow" add -mminimal-toc to
-+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+    _LT_AC_TAGVAR(archive_cmds, $1)=''
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+    if test "$GXX" = yes; then
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+     fi
+@@ -8745,7 +8857,7 @@
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+     if test "$GXX" = yes; then
+-      case $host_os in aix4.[012]|aix4.[012].*)
 +      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+      # 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`
-+	if test -f "$collect2name" && \
-+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	then
-+	  # We have reworked collect2
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+	else
-+	  # We have old collect2
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+	fi
+       # 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`
+@@ -8764,8 +8876,12 @@
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	fi
 +	;;
-+      esac
-+      shared_flag='-shared'
+       esac
+       shared_flag='-shared'
 +      if test "$aix_use_runtimelinking" = yes; then
 +	shared_flag="$shared_flag "'${wl}-G'
 +      fi
-+    else
-+      # not using gcc
-+      if test "$host_cpu" = ia64; then
-+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	# chokes on -Wl,-G. The following line is correct:
-+	shared_flag='-G'
-+      else
-+	if test "$aix_use_runtimelinking" = yes; then
+     else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+@@ -8774,15 +8890,16 @@
+ 	shared_flag='-G'
+       else
+ 	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='-qmkshrobj ${wl}-G'
 +	  shared_flag='${wl}-G'
-+	else
+ 	else
+-	  shared_flag='-qmkshrobj'
 +	  shared_flag='${wl}-bM:SRE'
-+	fi
-+      fi
-+    fi
-+
+ 	fi
+       fi
+     fi
+ 
+-    # Let the compiler handle the export list.
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
 +    # It seems that -bexpall does not export symbols beginning with
 +    # underscore (_), so it is better to generate a list of symbols to export.
 +    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+    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.
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-+      # Determine the default libpath from the value encoded in an empty executable.
-+      _LT_AC_SYS_LIBPATH_AIX
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+
+     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.
+@@ -8791,13 +8908,12 @@
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+     else
-+      if test "$host_cpu" = ia64; then
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+      else
+       if test "$host_cpu" = ia64; then
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+      else
-+	# Determine the default libpath from the value encoded in an empty executable.
-+	_LT_AC_SYS_LIBPATH_AIX
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	# Warning - without using the other run time loading flags,
-+	# -berok will link without error, but may produce a broken library.
-+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	# Exported symbols can be pulled into shared objects from archives
+       else
+ 	# Determine the default libpath from the value encoded in an empty executable.
+ 	_LT_AC_SYS_LIBPATH_AIX
+@@ -8806,22 +8922,32 @@
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	# -bexpall does not export symbols beginning with underscore (_)
+-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	# Exported symbols can be pulled into shared objects from archives
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
 +	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	# This is similar to how AIX traditionally builds it's shared libraries.
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +	# This is similar to how AIX traditionally builds its shared libraries.
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+      fi
-+    fi
-+    ;;
+       fi
+     fi
+     ;;
+-  chorus*)
+-    case $cc_basename in
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
 +
 +  beos*)
 +    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8953,32 +1573,34 @@
 +	# FIXME: insert proper C++ library support
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +	;;
-+    esac
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+    # as there is no search path for DLLs.
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+     esac
+     ;;
+ 
+@@ -8829,12 +8955,12 @@
+     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+     # as there is no search path for DLLs.
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
 +    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+
-+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+     _LT_AC_TAGVAR(always_export_symbols, $1)=no
+     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ 
+     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      # If the export-symbols file already is a .def file (1st line
-+      # is EXPORTS), use it as is; otherwise, prepend...
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	cp $export_symbols $output_objdir/$soname.def;
-+      else
-+	echo EXPORTS > $output_objdir/$soname.def;
-+	cat $export_symbols >> $output_objdir/$soname.def;
-+      fi~
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is; otherwise, prepend...
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -8843,70 +8969,81 @@
+ 	echo EXPORTS > $output_objdir/$soname.def;
+ 	cat $export_symbols >> $output_objdir/$soname.def;
+       fi~
+-      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 +      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+    else
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    fi
-+  ;;
+     else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     fi
+   ;;
 +      darwin* | rhapsody*)
 +        case $host_os in
 +        rhapsody* | darwin1.[[012]])
@@ -9005,13 +1627,62 @@
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 +      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
 +      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
+ 
+-  darwin* | rhapsody*)
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.[012])
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
 +    if test "$GXX" = yes ; then
 +      lt_int_apple_cc_single_mod=no
 +      output_verbose_link_cmd='echo'
 +      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
 +       lt_int_apple_cc_single_mod=yes
-+      fi
+       fi
+-      ;;
+-    esac
+-    lt_int_apple_cc_single_mod=no
+-    output_verbose_link_cmd='echo'
+-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-      lt_int_apple_cc_single_mod=yes
+-    fi
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    else
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-    fi
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    else
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    fi
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi
+-    ;;
 +      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 +       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
 +      else
@@ -9041,106 +1712,121 @@
 +      esac
 +      fi
 +        ;;
-+
-+  dgux*)
-+    case $cc_basename in
+ 
+   dgux*)
+     case $cc_basename in
+-      ec++)
 +      ec++*)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      ghcx)
 +      ghcx*)
-+	# Green Hills C++ Compiler
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -8917,14 +9054,14 @@
+ 	;;
+     esac
+     ;;
+-  freebsd[12]*)
 +  freebsd[[12]]*)
-+    # C++ shared libraries reported to be fairly broken before switch to ELF
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  freebsd-elf*)
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+    ;;
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   freebsd-elf*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+-  freebsd* | kfreebsd*-gnu)
 +  freebsd* | dragonfly*)
-+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+    # conventions
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+    ;;
-+  gnu*)
-+    ;;
-+  hpux9*)
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+				# but as the default
-+				# location of the library.
-+
-+    case $cc_basename in
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -8941,12 +9078,12 @@
+ 				# location of the library.
+ 
+     case $cc_basename in
+-    CC)
 +    CC*)
-+      # FIXME: insert proper C++ library support
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+-    aCC)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 +    aCC*)
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      # Commands to make compiler produce verbose output that lists
-+      # what "hidden" libraries, object files and flags are used when
-+      # linking a shared library.
-+      #
-+      # There doesn't appear to be a way to prevent this compiler from
-+      # 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.
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+@@ -8955,11 +9092,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.
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 +      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      ;;
-+    *)
-+      if test "$GXX" = yes; then
+       ;;
+     *)
+       if test "$GXX" = yes; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 +        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      else
-+        # FIXME: insert proper C++ library support
-+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+    esac
-+    ;;
-+  hpux10*|hpux11*)
-+    if test $with_gnu_ld = no; then
+       else
+         # FIXME: insert proper C++ library support
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -8969,34 +9106,23 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
+-      hppa*64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 +      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 +
 +      case $host_cpu in
 +      hppa*64*|ia64*)
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+        ;;
-+      *)
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+        ;;
-+      esac
-+    fi
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-        ;;
+-      ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         ;;
+       *)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
+-    hppa*64*)
 +    case $host_cpu in
 +    hppa*64*|ia64*)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+    *)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+					      # but as the default
-+					      # location of the library.
-+      ;;
-+    esac
-+
-+    case $cc_basename in
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+-    ia64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+-      ;;
+     *)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+@@ -9006,17 +9132,20 @@
+     esac
+ 
+     case $cc_basename in
+-      CC)
 +      CC*)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 +      aCC*)
 +	case $host_cpu in
 +	hppa*64*)
@@ -9148,43 +1834,37 @@
 +	  ;;
 +	ia64*)
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	  ;;
-+	*)
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	  ;;
-+	esac
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# 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.
-+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+      *)
-+	if test "$GXX" = yes; then
-+	  if test $with_gnu_ld = no; then
+ 	  ;;
+ 	esac
+ 	# Commands to make compiler produce verbose output that lists
+@@ -9032,12 +9161,15 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
+-	    ia64*|hppa*64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 +	    case $host_cpu in
 +	    hppa*64*)
 +	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	      ;;
 +	    ia64*)
 +	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      ;;
-+	    *)
+ 	      ;;
+ 	    *)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
 +	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      ;;
-+	    esac
-+	  fi
-+	else
-+	  # FIXME: insert proper C++ library support
-+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+    esac
-+    ;;
+ 	      ;;
+ 	    esac
+ 	  fi
+@@ -9048,11 +9180,25 @@
+ 	;;
+     esac
+     ;;
 +  interix3*)
 +    _LT_AC_TAGVAR(hardcode_direct, $1)=no
 +    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -9199,62 +1879,57 @@
 +    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +    ;;
-+  irix5* | irix6*)
-+    case $cc_basename in
+   irix5* | irix6*)
+     case $cc_basename in
+-      CC)
 +      CC*)
-+	# SGI C++
+ 	# SGI C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-+	# necessary to make sure instantiated templates are included
-+	# in the archive.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+	;;
-+      *)
-+	if test "$GXX" = yes; then
-+	  if test "$with_gnu_ld" = no; then
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+@@ -9063,9 +9209,9 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test "$with_gnu_ld" = no; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
 +	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	  else
+ 	  else
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 +	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-+	  fi
-+	fi
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+	;;
-+    esac
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+    ;;
+ 	  fi
+ 	fi
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -9074,16 +9220,16 @@
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+     ;;
+-  linux*)
 +  linux* | k*bsd*-gnu)
-+    case $cc_basename in
+     case $cc_basename in
+-      KCC)
 +      KCC*)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# 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.
-+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+	;;
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+@@ -9101,20 +9247,44 @@
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+-      icpc)
 +      icpc*)
-+	# Intel C++
-+	with_gnu_ld=yes
+ 	# Intel C++
+ 	with_gnu_ld=yes
 +	# version 8.0 and above of icpc choke on multiply defined symbols
 +	# if we add $predep_objects and $postdep_objects, however 7.1 and
 +	# earlier do not add the objects themselves.
@@ -9272,11 +1947,14 @@
 +	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	  ;;
 +	esac
-+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	;;
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	;;
+-      cxx)
 +      pgCC*)
 +        # Portland Group C++ compiler
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
@@ -9287,57 +1965,36 @@
 +	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
 +        ;;
 +      cxx*)
-+	# Compaq C++
+ 	# Compaq C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+
-+	runpath_var=LD_RUN_PATH
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# 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.
-+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+    esac
-+    ;;
-+  lynxos*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  m88k*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  mvs*)
-+    case $cc_basename in
+ 
+ 	runpath_var=LD_RUN_PATH
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -9142,7 +9312,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
 +      cxx*)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -9152,7 +9322,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
 +  netbsd* | netbsdelf*-gnu)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+      wlarc=
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+    fi
-+    # 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::"'
-+    ;;
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+@@ -9163,15 +9333,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::"'
+     ;;
 +  openbsd2*)
 +    # C++ shared libraries are fairly broken
 +    _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -9354,228 +2011,217 @@
 +    fi
 +    output_verbose_link_cmd='echo'
 +    ;;
-+  osf3*)
-+    case $cc_basename in
+   osf3*)
+     case $cc_basename in
+-      KCC)
 +      KCC*)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+
-+	;;
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -9181,14 +9367,14 @@
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 
+ 	;;
+-      RCC)
 +      RCC*)
-+	# Rational C++ 2.4.1
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
 +      cxx*)
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# 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.
-+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+      *)
-+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -9206,7 +9392,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	  # Commands to make compiler produce verbose output that lists
-+	  # what "hidden" libraries, object files and flags are used when
-+	  # linking a shared library.
-+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+	else
-+	  # FIXME: insert proper C++ library support
-+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+    esac
-+    ;;
-+  osf4* | osf5*)
-+    case $cc_basename in
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -9225,13 +9411,13 @@
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+-      KCC)
 +      KCC*)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Archives containing C++ object files must be created using
-+	# the KAI C++ compiler.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-+	;;
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -9240,17 +9426,17 @@
+ 	# the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ 	;;
+-      RCC)
 +      RCC*)
-+	# Rational C++ 2.4.1
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
 +      cxx*)
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+	  echo "-hidden">> $lib.exp~
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ 	  echo "-hidden">> $lib.exp~
+-	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
 +	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-+	  $rm $lib.exp'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# 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.
-+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+      *)
-+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	  $rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -9269,7 +9455,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
 +	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	  # Commands to make compiler produce verbose output that lists
-+	  # what "hidden" libraries, object files and flags are used when
-+	  # linking a shared library.
-+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+	else
-+	  # FIXME: insert proper C++ library support
-+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+    esac
-+    ;;
-+  psos*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  sunos4*)
-+    case $cc_basename in
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -9290,27 +9476,14 @@
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+-  sco*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case $cc_basename in
+-      CC)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+   sunos4*)
+     case $cc_basename in
+-      CC)
 +      CC*)
-+	# Sun C++ 4.x
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      lcc)
 +      lcc*)
-+	# Lucid
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+  solaris*)
-+    case $cc_basename in
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -9323,36 +9496,33 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
 +      CC*)
-+	# Sun C++ 4.2, 5.x and Centerline C++
+ 	# Sun C++ 4.2, 5.x and Centerline C++
 +        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
 +	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	case $host_os in
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	case $host_os in
+-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 +	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+	  *)
-+	    # The C++ compiler is used as linker so we must use $wl
-+	    # flag to pass the commands to the underlying system
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+-	    # linker.
 +	    # linker. We must also pass each convience library through
 +	    # to the system linker between allextract/defaultextract.
 +	    # The C++ compiler will combine linker options so we
 +	    # cannot just pass the convience library names through
 +	    # without $wl.
-+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
 +	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-+	    ;;
-+	esac
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# 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.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 +	output_verbose_link_cmd='echo'
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-+	# necessary to make sure instantiated templates are included
-+	# in the archive.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+	;;
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -9360,9 +9530,9 @@
+ 	# in the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ 	;;
+-      gcx)
 +      gcx*)
-+	# Green Hills C++ Compiler
+ 	# Green Hills C++ Compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+
-+	# The C++ compiler must be used to create the archive.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+	;;
-+      *)
-+	# GNU C++ compiler with Solaris linker
-+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+ 
+ 	# The C++ compiler must be used to create the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+@@ -9372,9 +9542,9 @@
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
 +	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
 +		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+	  else
-+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+	    # platform.
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -9383,9 +9553,9 @@
+ 	  else
+ 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	    # platform.
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
 +	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
 +		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+	  fi
-+
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+	fi
-+	;;
-+    esac
-+    ;;
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -9398,12 +9568,63 @@
+ 	;;
+     esac
+     ;;
+-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
 +  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
 +    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 +    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +    runpath_var='LD_RUN_PATH'
 +
@@ -9626,193 +2272,54 @@
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	;;
 +    esac
-+    ;;
-+  tandem*)
-+    case $cc_basename in
+     ;;
+   tandem*)
+     case $cc_basename in
+-      NCC)
 +      NCC*)
-+	# NonStop-UX NCC 3.20
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+  vxworks*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  *)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+esac
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+_LT_AC_TAGVAR(GCC, $1)="$GXX"
-+_LT_AC_TAGVAR(LD, $1)="$LD"
-+
-+## 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
-+## what you are doing...
-+AC_LIBTOOL_POSTDEP_PREDEP($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_POP
-+CC=$lt_save_CC
-+LDCXX=$LD
-+LD=$lt_save_LD
-+GCC=$lt_save_GCC
-+with_gnu_ldcxx=$with_gnu_ld
-+with_gnu_ld=$lt_save_with_gnu_ld
-+lt_cv_path_LDCXX=$lt_cv_path_LD
-+lt_cv_path_LD=$lt_save_path_LD
-+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+])# AC_LIBTOOL_LANG_CXX_CONFIG
-+
-+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -9440,8 +9661,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -9459,7 +9678,7 @@
+ ])# AC_LIBTOOL_LANG_CXX_CONFIG
+ 
+ # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------
 +# ------------------------------------
-+# Figure out "hidden" library dependencies from verbose
-+# compiler output when linking a shared library.
-+# Parse the compiler output and extract the necessary
-+# objects, libraries and library flags.
-+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-+dnl we can't use the lt_simple_compile_test_code here,
-+dnl because it contains code intended for an executable,
-+dnl not a library.  It's possible we should let each
-+dnl tag define a new lt_????_link_test_code variable,
-+dnl but it's only used here...
-+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-+int a;
-+void foo (void) { a = 0; }
-+EOF
-+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-+class Foo
-+{
-+public:
-+  Foo (void) { a = 0; }
-+private:
-+  int a;
-+};
-+EOF
-+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-+      subroutine foo
-+      implicit none
-+      integer*4 a
-+      a=0
-+      return
-+      end
-+EOF
-+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-+public class foo {
-+  private int a;
-+  public void bar (void) {
-+    a = 0;
-+  }
-+};
-+EOF
-+])
-+dnl Parse the compiler output and extract the necessary
-+dnl objects, libraries and library flags.
-+if AC_TRY_EVAL(ac_compile); then
-+  # Parse the compiler output and extract the necessary
-+  # objects, libraries and library flags.
-+
-+  # Sentinel used to keep track of whether or not we are before
-+  # the conftest object file.
-+  pre_test_object_deps_done=no
-+
-+  # 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.
+ # Figure out "hidden" library dependencies from verbose
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+@@ -9513,7 +9732,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.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
 +  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-+
-+  for p in `eval $output_verbose_link_cmd`; do
-+    case $p in
-+
-+    -L* | -R* | -l*)
-+       # Some compilers place space between "-{L,R}" and the path.
-+       # Remove the space.
-+       if test $p = "-L" \
-+	  || test $p = "-R"; then
-+	 prev=$p
-+	 continue
-+       else
-+	 prev=
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 case $p in
-+	 -L* | -R*)
-+	   # Internal compiler library paths should come after those
-+	   # provided the user.  The postdeps already come after the
-+	   # user supplied libs so there is no need to process them.
-+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-+	   else
-+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-+	   fi
-+	   ;;
-+	 # The "-l" case would never come before the object being
-+	 # linked, so don't bother handling this case.
-+	 esac
-+       else
-+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-+	 else
-+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-+	 fi
-+       fi
-+       ;;
-+
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+@@ -9553,7 +9772,7 @@
+        fi
+        ;;
+ 
+-    *.$objext|*.$libext)
 +    *.$objext)
-+       # This assumes that the test object file only shows up
-+       # once in the compiler output.
-+       if test "$p" = "conftest.$objext"; then
-+	 pre_test_object_deps_done=yes
-+	 continue
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-+	 else
-+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-+	 fi
-+       else
-+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-+	 else
-+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-+	 fi
-+       fi
-+       ;;
-+
-+    *) ;; # Ignore the rest.
-+
-+    esac
-+  done
-+
-+  # Clean up.
-+  rm -f a.out a.exe
-+else
-+  echo "libtool.m4: error: problem compiling $1 test program"
-+fi
-+
-+$rm -f confest.$objext
-+
+        # This assumes that the test object file only shows up
+        # once in the compiler output.
+        if test "$p" = "conftest.$objext"; then
+@@ -9589,13 +9808,37 @@
+ 
+ $rm -f confest.$objext
+ 
 +# PORTME: override above test on systems where it is broken
 +ifelse([$1],[CXX],
 +[case $host_os in
@@ -9837,769 +2344,253 @@
 +esac
 +])
 +
-+case " $_LT_AC_TAGVAR(postdeps, $1) " in
-+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-+esac
-+])# AC_LIBTOOL_POSTDEP_PREDEP
-+
-+# AC_LIBTOOL_LANG_F77_CONFIG
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+ ])# AC_LIBTOOL_POSTDEP_PREDEP
+ 
+ # AC_LIBTOOL_LANG_F77_CONFIG
+-# ------------------------
 +# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-+[AC_REQUIRE([AC_PROG_F77])
-+AC_LANG_PUSH(Fortran 77)
-+
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+_LT_AC_TAGVAR(always_export_symbols, $1)=no
-+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_direct, $1)=no
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+_LT_AC_TAGVAR(module_cmds, $1)=
-+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_AC_TAGVAR(no_undefined_flag, $1)=
-+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for f77 test sources.
-+ac_ext=f
-+
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="      program t\n      end\n"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -9639,12 +9882,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
 +# save warnings/boilerplate of simple test code
 +_LT_COMPILER_BOILERPLATE
 +_LT_LINKER_BOILERPLATE
 +
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${F77-"f77"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
 +_LT_CC_BASENAME([$compiler])
-+
-+AC_MSG_CHECKING([if libtool supports shared libraries])
-+AC_MSG_RESULT([$can_build_shared])
-+
-+AC_MSG_CHECKING([whether to build shared libraries])
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
+ 
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -9654,7 +9901,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
 +case $host_os in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -9662,8 +9909,10 @@
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+-aix4*)
+-  test "$enable_shared" = yes && enable_static=no
 +aix4* | aix5*)
 +  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 +    test "$enable_shared" = yes && enable_static=no
 +  fi
-+  ;;
-+esac
-+AC_MSG_RESULT([$enable_shared])
-+
-+AC_MSG_CHECKING([whether to build static libraries])
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+AC_MSG_RESULT([$enable_static])
-+
-+_LT_AC_TAGVAR(GCC, $1)="$G77"
-+_LT_AC_TAGVAR(LD, $1)="$LD"
-+
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_F77_CONFIG
-+
-+
-+# AC_LIBTOOL_LANG_GCJ_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-+[AC_LANG_SAVE
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}\n"
-+
-+# Code to be used in simple link tests
+   ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+@@ -9673,8 +9922,6 @@
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+ 
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+-
+ _LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+@@ -9684,8 +9931,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -9714,20 +9959,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
 +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
 +# save warnings/boilerplate of simple test code
 +_LT_COMPILER_BOILERPLATE
 +_LT_LINKER_BOILERPLATE
 +
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${GCJ-"gcj"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
 +_LT_CC_BASENAME([$compiler])
-+
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
 +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 +
-+## 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
-+## what you are doing...
-+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_GCJ_CONFIG
-+
-+
-+# AC_LIBTOOL_LANG_RC_CONFIG
+ ## 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
+@@ -9739,8 +9991,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -9750,7 +10000,7 @@
+ 
+ 
+ # AC_LIBTOOL_LANG_RC_CONFIG
+-# --------------------------
 +# -------------------------
-+# Ensure that the configuration vars for the Windows resource compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-+[AC_LANG_SAVE
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
+ # Ensure that the configuration vars for the Windows resource compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -9774,11 +10024,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
 +# save warnings/boilerplate of simple test code
 +_LT_COMPILER_BOILERPLATE
 +_LT_LINKER_BOILERPLATE
 +
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${RC-"windres"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
 +_LT_CC_BASENAME([$compiler])
-+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_RC_CONFIG
-+
-+
-+# AC_LIBTOOL_CONFIG([TAGNAME])
-+# ----------------------------
-+# If TAGNAME is not passed, then create an initial libtool script
-+# with a default configuration from the untagged config vars.  Otherwise
-+# add code to config.status for appending the configuration named by
-+# TAGNAME from the matching tagged config vars.
-+AC_DEFUN([AC_LIBTOOL_CONFIG],
-+[# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  # See if we are running on zsh, and set the options which allow our commands through
-+  # without removal of \ escapes.
-+  if test -n "${ZSH_VERSION+set}" ; then
-+    setopt NO_GLOB_SUBST
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+ AC_LIBTOOL_CONFIG($1)
+@@ -9804,11 +10059,12 @@
+   # without removal of \ escapes.
+   if test -n "${ZSH_VERSION+set}" ; then
+     setopt NO_GLOB_SUBST
+-  fi  
 +  fi
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
+   # Now quote all the things that may contain metacharacters while being
+   # careful not to overquote the AC_SUBSTed values.  We take copies of the
+   # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
 +  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
 +    SED SHELL STRIP \
-+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+    deplibs_check_method reload_flag reload_cmds need_locks \
-+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+    lt_cv_sys_global_symbol_to_c_name_address \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    old_postinstall_cmds old_postuninstall_cmds \
-+    _LT_AC_TAGVAR(compiler, $1) \
-+    _LT_AC_TAGVAR(CC, $1) \
-+    _LT_AC_TAGVAR(LD, $1) \
-+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-+    _LT_AC_TAGVAR(predep_objects, $1) \
-+    _LT_AC_TAGVAR(postdep_objects, $1) \
-+    _LT_AC_TAGVAR(predeps, $1) \
-+    _LT_AC_TAGVAR(postdeps, $1) \
-+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-+    _LT_AC_TAGVAR(archive_cmds, $1) \
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-+    _LT_AC_TAGVAR(module_cmds, $1) \
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-+    _LT_AC_TAGVAR(include_expsyms, $1); do
-+
-+    case $var in
-+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-+    _LT_AC_TAGVAR(archive_cmds, $1) | \
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-+    _LT_AC_TAGVAR(module_cmds, $1) | \
+     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 \
+@@ -9858,7 +10114,7 @@
+     _LT_AC_TAGVAR(archive_cmds, $1) | \
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(module_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
 +    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  case $lt_echo in
-+  *'\[$]0 --fallback-echo"')
-+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-+    ;;
-+  esac
-+
-+ifelse([$1], [],
-+  [cfgfile="${ofile}T"
-+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-+  $rm -f "$cfgfile"
-+  AC_MSG_NOTICE([creating $ofile])],
-+  [cfgfile="$ofile"])
-+
-+  cat <<__EOF__ >> "$cfgfile"
-+ifelse([$1], [],
-+[#! $SHELL
-+
-+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Libtool:
-+# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# A sed program that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+     _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+     extract_expsyms_cmds | reload_cmds | finish_cmds | \
+@@ -9924,11 +10180,11 @@
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
 +Xsed="$SED -e 1s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+# The names of the tagged configurations supported by this script.
-+available_tags=
-+
-+# ### BEGIN LIBTOOL CONFIG],
-+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -9959,6 +10215,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
 +host_os=$host_os
 +
 +# The build system.
 +build_alias=$build_alias
 +build=$build
 +build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -9970,6 +10232,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
 +# LTCC compiler flags.
 +LTCFLAGS=$lt_LTCFLAGS
 +
-+# A language-specific compiler.
-+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ 
+@@ -9989,7 +10254,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
 +STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -10020,7 +10285,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
 +shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-+
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -10035,7 +10300,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ 
+-# Must we lock files when doing compilation ?
 +# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-+
-+ifelse([$1],[],
-+[# ### END LIBTOOL CONFIG],
-+[# ### END LIBTOOL TAG CONFIG: $tagname])
-+
-+__EOF__
-+
-+ifelse([$1],[], [
-+  case $host_os in
-+  aix3*)
-+    cat <<\EOF >> "$cfgfile"
-+
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+EOF
-+    ;;
-+  esac
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-+
-+  mv -f "$cfgfile" "$ofile" || \
-+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+  chmod +x "$ofile"
-+])
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -10264,7 +10529,10 @@
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+-  test -f Makefile && make "$ltmain"
 +  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
 +  if test -f "$ltmain_in"; then
 +    test -f Makefile && make "$ltmain"
 +  fi
-+fi
-+])# AC_LIBTOOL_CONFIG
-+
-+
-+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-+# -------------------------------------------
-+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+
-+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+
-+if test "$GCC" = yes; then
-+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+
-+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-+    lt_cv_prog_compiler_rtti_exceptions,
-+    [-fno-rtti -fno-exceptions], [],
-+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-+fi
-+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-+
-+
-+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+# ---------------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-+[AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([AC_PROG_NM])
-+AC_REQUIRE([AC_OBJEXT])
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-+[
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[[BCDT]]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[[ABCDGISTW]]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDEGRST]]'
-+  fi
-+  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'"
-+  ;;
+ fi
+ ])# AC_LIBTOOL_CONFIG
+ 
+@@ -10306,9 +10574,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+@@ -10330,14 +10595,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'"
+   ;;
 +linux* | k*bsd*-gnu)
 +  if test "$host_cpu" = ia64; then
 +    symcode='[[ABCDGIRSTW]]'
@@ -10607,12 +2598,14 @@
 +    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'"
 +  fi
 +  ;;
-+irix* | nonstopux*)
-+  symcode='[[BCDEGRST]]'
-+  ;;
-+osf*)
-+  symcode='[[BCDEGQRST]]'
-+  ;;
+ irix* | nonstopux*)
+   symcode='[[BCDEGRST]]'
+   ;;
+ osf*)
+   symcode='[[BCDEGQRST]]'
+   ;;
+-solaris* | sysv5*)
+-  symcode='[[BDT]]'
 +solaris*)
 +  symcode='[[BDRT]]'
 +  ;;
@@ -10624,232 +2617,60 @@
 +  ;;
 +sysv5* | sco5v6* | unixware* | OpenUNIX*)
 +  symcode='[[ABDT]]'
-+  ;;
-+sysv4)
-+  symcode='[[DFNSTU]]'
-+  ;;
-+esac
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
+   ;;
+ sysv4)
+   symcode='[[DFNSTU]]'
+@@ -10355,14 +10636,17 @@
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+-  symcode='[[ABCDGISTW]]' ;;
 +  symcode='[[ABCDGIRSTW]]' ;;
-+esac
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
+ esac
+ 
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
+ 
 +  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
 +  symxfrm="\\1 $ac_symprfx\\2 \\2"
 +
-+  # Write the raw and C identifiers.
+   # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
 +  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+  if AC_TRY_EVAL(ac_compile); then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-+
-+	  cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr_t void *
-+#else
-+# define lt_ptr_t char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr_t address;
-+}
-+lt_preloaded_symbols[[]] =
-+{
-+EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-+	  cat <<\EOF >> conftest.$ac_ext
-+  {0, (lt_ptr_t) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  lt_save_LIBS="$LIBS"
-+	  lt_save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$lt_save_LIBS"
-+	  CFLAGS="$lt_save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -f conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+])
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  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
-+  AC_MSG_RESULT(failed)
-+else
-+  AC_MSG_RESULT(ok)
-+fi
-+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+
-+
-+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-+# ---------------------------------------
-+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-+
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+ ifelse([$1],[CXX],[
-+  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
-+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+    case $host_os in
-+    aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    mingw* | os2* | pw32*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      ;;
-+    *djgpp*)
-+      # DJGPP does not support shared libraries at all
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+      ;;
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+@@ -10518,6 +10802,10 @@
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
 +    interix3*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+      fi
-+      ;;
-+    hpux*)
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+@@ -10526,7 +10814,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
 +      case $host_cpu in
-+      hppa*64*|ia64*)
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
-+      esac
-+      ;;
-+    *)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+      ;;
-+    esac
-+  else
-+    case $host_os in
-+      aix4* | aix5*)
-+	# All AIX code is PIC.
-+	if test "$host_cpu" = ia64; then
-+	  # AIX 5 now supports IA64 processor
-+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	else
-+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+	fi
-+	;;
-+      chorus*)
-+	case $cc_basename in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+@@ -10551,18 +10839,28 @@
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+-	cxch68)
 +	cxch68*)
-+	  # Green Hills C++ Compiler
-+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-+	  ;;
-+	esac
-+	;;
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
 +       darwin*)
 +         # PIC is the default on this platform
 +         # Common symbols not allowed in MH_DYLIB files
@@ -10860,74 +2681,82 @@
 +           ;;
 +         esac
 +       ;;
-+      dgux*)
-+	case $cc_basename in
+       dgux*)
+ 	case $cc_basename in
+-	  ec++)
 +	  ec++*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    ;;
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+-	  ghcx)
 +	  ghcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -10570,22 +10868,22 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu)
 +      freebsd* | dragonfly*)
-+	# FreeBSD uses GNU C++
-+	;;
-+      hpux9* | hpux10* | hpux11*)
-+	case $cc_basename in
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+ 	case $cc_basename in
+-	  CC)
 +	  CC*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
 +	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+	    if test "$host_cpu" != ia64; then
-+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	    fi
-+	    ;;
+ 	    if test "$host_cpu" != ia64; then
+ 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	    fi
+ 	    ;;
+-	  aCC)
 +	  aCC*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
 +	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 +	    case $host_cpu in
-+	    hppa*64*|ia64*)
-+	      # +Z the default
-+	      ;;
-+	    *)
-+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	      ;;
-+	    esac
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -10598,9 +10896,13 @@
+ 	    ;;
+ 	esac
+ 	;;
 +      interix*)
 +	# This is c89, which is MS Visual C++ (no shared libs)
 +	# Anyone wants to do a port?
 +	;;
-+      irix5* | irix6* | nonstopux*)
-+	case $cc_basename in
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+-	  CC)
 +	  CC*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    # CC pic flag -KPIC is the default.
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+@@ -10609,20 +10911,26 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux*)
 +      linux* | k*bsd*-gnu)
-+	case $cc_basename in
+ 	case $cc_basename in
+-	  KCC)
 +	  KCC*)
-+	    # KAI C++ Compiler
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	    ;;
+ 	    # KAI C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+-	  icpc)
 +	  icpc* | ecpc*)
-+	    # Intel C++
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 	    # Intel C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-	    ;; 
+-	  cxx)
 +	    ;;
 +	  pgCC*)
 +	    # Portland Group C++ compiler.
@@ -10936,95 +2765,96 @@
 +	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	    ;;
 +	  cxx*)
-+	    # Compaq C++
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      lynxos*)
-+	;;
-+      m88k*)
-+	;;
-+      mvs*)
-+	case $cc_basename in
+ 	    # Compaq C++
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -10639,25 +10947,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
 +	  cxx*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
 +      netbsd* | netbsdelf*-gnu)
-+	;;
-+      osf3* | osf4* | osf5*)
-+	case $cc_basename in
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+-	  KCC)
 +	  KCC*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+	    ;;
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    ;;
+-	  RCC)
 +	  RCC*)
-+	    # Rational C++ 2.4.1
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
+ 	    # Rational C++ 2.4.1
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+-	  cxx)
 +	  cxx*)
-+	    # Digital/Compaq C++
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      psos*)
-+	;;
-+      solaris*)
-+	case $cc_basename in
+ 	    # Digital/Compaq C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+@@ -10671,24 +10979,15 @@
+ 	;;
+       psos*)
+ 	;;
+-      sco*)
+-	case $cc_basename in
+-	  CC)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+       solaris*)
+ 	case $cc_basename in
+-	  CC)
 +	  CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+	    ;;
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ 	    ;;
+-	  gcx)
 +	  gcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sunos4*)
-+	case $cc_basename in
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ 	    ;;
+@@ -10698,12 +10997,12 @@
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+-	  CC)
 +	  CC*)
-+	    # Sun C++ 4.x
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
+ 	    # Sun C++ 4.x
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    ;;
+-	  lcc)
 +	  lcc*)
-+	    # Lucid
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      tandem*)
-+	case $cc_basename in
+ 	    # Lucid
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -10713,7 +11012,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
 +	  NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+@@ -10721,7 +11020,14 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      unixware*)
 +      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +	case $cc_basename in
 +	  CC*)
@@ -11033,99 +2863,34 @@
 +	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	    ;;
 +	esac
-+	;;
-+      vxworks*)
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+	;;
-+    esac
-+  fi
-+],
-+[
-+  if test "$GCC" = yes; then
-+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+    case $host_os in
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+
-+    mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      ;;
-+
+ 	;;
+       vxworks*)
+ 	;;
+@@ -10768,6 +11074,11 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
 +    interix3*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
 +
-+    msdosdjgpp*)
-+      # Just because we use GCC doesn't mean we suddenly get shared libraries
-+      # on systems that don't support them.
-+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      enable_shared=no
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+      fi
-+      ;;
-+
-+    hpux*)
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -10784,7 +11095,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
 +      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
-+      esac
-+      ;;
-+
-+    *)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
-+    aix*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      else
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -10810,6 +11121,16 @@
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
 +      darwin*)
 +        # PIC is the default on this platform
 +        # Common symbols not allowed in MH_DYLIB files
@@ -11136,47 +2901,31 @@
 +         ;;
 +       esac
 +       ;;
-+
-+    mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -10821,7 +11142,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
 +      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    newsos6)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -10844,13 +11165,20 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+-    linux*)
+-      case $CC in
 +    linux* | k*bsd*-gnu)
 +      case $cc_basename in
-+      icc* | ecc*)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+        ;;
+       icc* | ecc*)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+         ;;
 +      pgcc* | pgf77* | pgf90* | pgf95*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
@@ -11184,50 +2933,44 @@
 +	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 +	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +        ;;
-+      ccc*)
-+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+        # All Alpha code is PIC.
-+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+        ;;
-+      esac
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # All OSF/1 code is PIC.
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    solaris*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ccc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         # All Alpha code is PIC.
+@@ -10865,15 +11193,15 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+-      ;;
+-
+     solaris*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      case $cc_basename in
 +      f77* | f90* | f95*)
 +	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
 +      *)
 +	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
 +      esac
-+      ;;
-+
-+    sunos4*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
+       ;;
+ 
+     sunos4*)
+@@ -10882,7 +11210,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -10895,6 +11223,17 @@
+       fi
+       ;;
+ 
 +    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -11239,42 +2982,22 @@
 +      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 +      ;;
 +
-+    uts4*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    *)
-+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+    esac
-+  fi
-+])
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-+     "" | " "*) ;;
-+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-+     esac],
-+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-+fi
+     uts4*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -10922,7 +11261,7 @@
+     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
 +case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+    ;;
-+  *)
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-+    ;;
-+esac
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -10931,6 +11270,16 @@
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+     ;;
+ esac
 +
 +#
 +# Check to make sure the static flag actually works.
@@ -11285,101 +3008,55 @@
 +  $lt_tmp_static_flag,
 +  [],
 +  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-+])
-+
-+
-+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-+# ------------------------------------
-+# See if the linker supports building shared libraries.
-+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-+[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+ifelse([$1],[CXX],[
-+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  case $host_os in
-+  aix4* | aix5*)
-+    # If we're using GNU nm, then we don't want the "-C" option.
-+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+    else
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+    fi
-+    ;;
-+  pw32*)
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-+  ;;
-+  cygwin* | mingw*)
+ ])
+ 
+ 
+@@ -10955,7 +11304,10 @@
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 +    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 +  ;;
 +  linux* | k*bsd*-gnu)
 +    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
-+  *)
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  esac
-+],[
-+  runpath_var=
-+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+  _LT_AC_TAGVAR(archive_cmds, $1)=
-+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+  _LT_AC_TAGVAR(module_cmds, $1)=
+   ;;
+   *)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+@@ -10981,7 +11333,7 @@
+   _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+   _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+   _LT_AC_TAGVAR(module_cmds, $1)=
+-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
 +  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  _LT_AC_TAGVAR(include_expsyms, $1)=
-+  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
-+  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+  # platforms (ab)use it in PIC code, but their linkers get confused if
-+  # the symbol is explicitly referenced.  Since portable code cannot
-+  # rely on this symbol name, it's probably fine to never include it in
-+  # preloaded symbol tables.
-+  extract_expsyms_cmds=
+   _LT_AC_TAGVAR(always_export_symbols, $1)=no
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   # include_expsyms should be a list of space-separated symbols to be *always*
+@@ -10998,7 +11350,8 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
+-
 +  # Just being paranoid about ensuring that cc_basename is set.
 +  _LT_CC_BASENAME([$compiler])
-+  case $host_os in
-+  cygwin* | mingw* | pw32*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+     # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -11008,6 +11361,10 @@
+       with_gnu_ld=no
+     fi
+     ;;
 +  interix*)
 +    # we just hope/assume this is gcc and not c89 (= MSVC++)
 +    with_gnu_ld=yes
 +    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+  esac
-+
-+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+  if test "$with_gnu_ld" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
-+
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+@@ -11018,6 +11375,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
@@ -11401,74 +3078,48 @@
 +      *) supports_anon_versioning=yes ;;
 +    esac
 +
-+    # See if GNU ld supports shared libraries.
-+    case $host_os in
-+    aix3* | aix4* | aix5*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+
-+      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
-+      # that the semantics of dynamic libraries on AmigaOS, at least up
-+      # to version 4, is to share data among multiple programs linked
-+      # with the same dynamic library.  Since this doesn't match the
-+      # behavior of shared libraries on other platforms, we can't use
-+      # them.
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+
-+    beos*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -11055,7 +11433,7 @@
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    cygwin* | mingw* | pw32*)
-+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+      # as there is no search path for DLLs.
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -11065,13 +11443,13 @@
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
 +      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       _LT_AC_TAGVAR(always_export_symbols, $1)=no
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 +      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+
-+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
+ 	# If the export-symbols file already is a .def file (1st line
+ 	# is EXPORTS), use it as is; otherwise, prepend...
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -11080,23 +11458,70 @@
+ 	  echo EXPORTS > $output_objdir/$soname.def;
+ 	  cat $export_symbols >> $output_objdir/$soname.def;
+ 	fi~
+-	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      else
+       else
+-	ld_shlibs=no
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    netbsd*)
 +    interix3*)
 +      _LT_AC_TAGVAR(hardcode_direct, $1)=no
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -11517,36 +3168,35 @@
 +      ;;
 +
 +    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    solaris* | sysv5*)
 +    solaris*)
-+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	cat <<EOF 1>&2
+@@ -11110,13 +11535,40 @@
+ 
+ EOF
+       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
 +    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 +      case `$LD -v 2>&1` in
 +        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
@@ -11574,62 +3224,55 @@
 +      esac
 +      ;;
 +
-+    sunos4*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    *)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+     sunos4*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+@@ -11126,24 +11578,19 @@
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+    esac
-+
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+     esac
+ 
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-      fi
 +    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
 +      runpath_var=
 +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
 +      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
 +      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+  else
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -11155,7 +11602,7 @@
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
 +      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-+      fi
-+      ;;
-+
-+    aix4* | aix5*)
-+      if test "$host_cpu" = ia64; then
-+	# On IA64, the linker does run time linking by default, so we don't
-+	# have to do anything special.
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -11177,9 +11624,21 @@
+ 	else
+ 	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ 	fi
 +	aix_use_runtimelinking=no
-+	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
-+      else
-+	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+	else
-+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+	fi
-+	aix_use_runtimelinking=no
 +
 +	# Test if we are trying to use run time linking or normal
 +	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -11643,130 +3286,146 @@
 +	  done
 +	  ;;
 +	esac
-+
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
-+
-+      # When large executables or shared objects are built, AIX ld can
-+      # have problems creating the table of contents.  If linking a library
-+      # or program results in "error TOC overflow" add -mminimal-toc to
-+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+      _LT_AC_TAGVAR(archive_cmds, $1)=''
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+      if test "$GCC" = yes; then
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+@@ -11196,7 +11655,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.[012]|aix4.[012].*)
 +	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+	# 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`
-+	  if test -f "$collect2name" && \
-+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	  then
-+  	  # We have reworked collect2
-+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+	  else
-+  	  # We have old collect2
-+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-+  	  # It fails to find uninstalled libraries when the uninstalled
-+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+  	  # to unsupported forces relinking
-+  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+	  fi
+ 	# 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`
+@@ -11215,8 +11674,12 @@
+   	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+   	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	  fi
 +	  ;;
-+	esac
-+	shared_flag='-shared'
+ 	esac
+ 	shared_flag='-shared'
 +	if test "$aix_use_runtimelinking" = yes; then
 +	  shared_flag="$shared_flag "'${wl}-G'
 +	fi
-+      else
-+	# not using gcc
-+	if test "$host_cpu" = ia64; then
-+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+  	# chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+	else
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -11224,30 +11687,30 @@
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
 +	  if test "$aix_use_runtimelinking" = yes; then
 +	    shared_flag='${wl}-G'
-+	  else
+ 	  else
+-	    shared_flag='-qmkshrobj'
+-  	fi
 +	    shared_flag='${wl}-bM:SRE'
 +	  fi
-+	fi
-+      fi
-+
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+      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.
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-+       # Determine the default libpath from the value encoded in an empty executable.
+       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.
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	_LT_AC_SYS_LIBPATH_AIX
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	_LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +       _LT_AC_SYS_LIBPATH_AIX
 +       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+       else
-+	if test "$host_cpu" = ia64; then
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
 +	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+	else
-+	 # Determine the default libpath from the value encoded in an empty executable.
-+	 _LT_AC_SYS_LIBPATH_AIX
-+	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	  # Warning - without using the other run time loading flags,
-+	  # -berok will link without error, but may produce a broken library.
-+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	  # Exported symbols can be pulled into shared objects from archives
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 _LT_AC_SYS_LIBPATH_AIX
+@@ -11256,13 +11719,11 @@
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	  # Exported symbols can be pulled into shared objects from archives
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
 +	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	fi
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      # see comment about different semantics on the GNU ld section
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+
+ 	fi
+       fi
+       ;;
+@@ -11275,7 +11736,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    bsdi4*)
 +    bsdi[[45]]*)
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-+      ;;
-+
-+    cygwin* | mingw* | pw32*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+@@ -11285,69 +11746,69 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
 +      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      # Tell ltmain to make .lib files, not .a files.
-+      libext=lib
-+      # Tell ltmain to make .dll files, not .so files.
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
 +      shrext_cmds=".dll"
-+      # FIXME: Setting linknames here is a bad hack.
+       # FIXME: Setting linknames here is a bad hack.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-+      # FIXME: Should let the user specify the lib program.
-+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+       # The linker will automatically build a .lib file if we build a DLL.
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+       # FIXME: Should let the user specify the lib program.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
 +      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      ;;
-+
-+    darwin* | rhapsody*)
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[[012]])
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.[012])
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
 +      case $host_os in
 +        rhapsody* | darwin1.[[012]])
 +         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
@@ -11785,13 +3444,35 @@
 +           esac
 +         fi
 +         ;;
-+      esac
+       esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-      fi
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
 +      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    else  
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi  
 +    if test "$GCC" = yes ; then
 +    	output_verbose_link_cmd='echo'
 +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
@@ -11814,63 +3495,39 @@
 +          ;;
 +      esac
 +    fi
-+      ;;
-+
-+    dgux*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    freebsd1*)
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+
-+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+    # support.  Future versions do this automatically, but an explicit c++rt0.o
-+    # does not break anything, and helps significantly (at the cost of a little
-+    # extra space).
-+    freebsd2.2*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+       ;;
+ 
+     dgux*)
+@@ -11380,8 +11841,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
 +    freebsd* | dragonfly*)
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -11389,7 +11850,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$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
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      ;;
-+
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$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
+@@ -11403,47 +11864,62 @@
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       ;;
+ 
+-    hpux10* | hpux11*)
 +    hpux10*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -11896,153 +3553,160 @@
 +	  ;;
 +	ia64*)
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      else
+ 	  ;;
+ 	esac
+       else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	case $host_cpu in
 +	hppa*64*)
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      fi
-+      if test "$with_gnu_ld" = no; then
+ 	  ;;
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 +	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 +	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 +
 +	case $host_cpu in
 +	hppa*64*|ia64*)
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	  ;;
-+	*)
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ 	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ 
+@@ -11457,7 +11933,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
-+
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+@@ -11467,7 +11943,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    newsos6)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    openbsd*)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -11490,7 +11966,8 @@
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      else
-+       case $host_os in
-+	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	   ;;
-+	 *)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       else
+@@ -11500,7 +11977,7 @@
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	   ;;
-+       esac
-+      fi
-+      ;;
-+
-+    os2*)
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -11511,14 +11988,14 @@
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
-+
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      else
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$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'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      ;;
-+
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$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'
+@@ -11530,13 +12007,13 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      else
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
 +	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+	# Both c and cxx compiler support -rpath directly
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      ;;
-+
-+    solaris*)
-+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-+      if test "$GCC" = yes; then
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -11544,21 +12021,15 @@
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       ;;
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+-
+     solaris*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	wlarc='${wl}'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-+      else
+       else
 +	wlarc=''
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$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'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      case $host_os in
-+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$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'
+@@ -11567,8 +12038,18 @@
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
 +      *)
 + 	# The compiler driver will combine linker options so we
 + 	# cannot just pass the convience library names through
@@ -12055,77 +3719,58 @@
 + 	*)
 + 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
 + 	esac ;;
-+      esac
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
-+
-+    sunos4*)
-+      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.
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -11577,7 +12058,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.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+        ;;
-+	motorola)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    sysv4.3*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+      fi
-+      ;;
-+
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -11625,36 +12106,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
 +      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
 +      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
 +      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
+       fi
+-      runpath_var='LD_RUN_PATH'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    sysv5*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$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'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
 +    sysv5* | sco3.2v5* | sco5v6*)
 +      # Note: We can NOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
@@ -12136,12 +3781,12 @@
 +      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
 +      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
 +      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
 +      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
 +      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 +      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
+       runpath_var='LD_RUN_PATH'
 +
 +      if test "$GCC" = yes; then
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -12150,4096 +3795,336 @@
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
-+      ;;
+       ;;
+ 
+     uts4*)
+@@ -11672,11 +12162,6 @@
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -11697,13 +12182,14 @@
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-  
 +
-+    uts4*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    *)
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+    esac
-+  fi
-+])
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-+x|xyes)
-+  # Assume -lc should be added
-+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-+      ;;
-+    '$CC '*)
-+      # 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.
-+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-+      $rm conftest*
-+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
 +	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-+        then
-+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+        else
-+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+        fi
-+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $rm conftest*
-+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
-+])# AC_LIBTOOL_PROG_LD_SHLIBS
-+
-+
-+# _LT_AC_FILE_LTDLL_C
-+# -------------------
-+# Be careful that the start marker always follows a newline.
-+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-+# /* ltdll.c starts here */
-+# #define WIN32_LEAN_AND_MEAN
-+# #include <windows.h>
-+# #undef WIN32_LEAN_AND_MEAN
-+# #include <stdio.h>
-+#
-+# #ifndef __CYGWIN__
-+# #  ifdef __CYGWIN32__
-+# #    define __CYGWIN__ __CYGWIN32__
-+# #  endif
-+# #endif
-+#
-+# #ifdef __cplusplus
-+# extern "C" {
-+# #endif
-+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-+# #ifdef __cplusplus
-+# }
-+# #endif
-+#
-+# #ifdef __CYGWIN__
-+# #include <cygwin/cygwin_dll.h>
-+# DECLARE_CYGWIN_DLL( DllMain );
-+# #endif
-+# HINSTANCE __hDllInstance_base;
-+#
-+# BOOL APIENTRY
-+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-+# {
-+#   __hDllInstance_base = hInst;
-+#   return TRUE;
-+# }
-+# /* ltdll.c ends here */
-+])# _LT_AC_FILE_LTDLL_C
-+
-+
-+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-+# ---------------------------------
-+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-+
-+
-+# old names
-+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-+
-+# This is just to silence aclocal about the macro not being used
-+ifelse([AC_DISABLE_FAST_INSTALL])
-+
-+AC_DEFUN([LT_AC_PROG_GCJ],
-+[AC_CHECK_TOOL(GCJ, gcj, no)
-+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+  AC_SUBST(GCJFLAGS)
-+])
-+
-+AC_DEFUN([LT_AC_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres, no)
-+])
-+
-+############################################################
-+# NOTE: This macro has been submitted for inclusion into   #
-+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-+#  a released version of Autoconf we should remove this    #
-+#  macro and use it instead.                               #
-+############################################################
-+# LT_AC_PROG_SED
-+# --------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible.  Prefer GNU sed if found.
-+AC_DEFUN([LT_AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for lt_ac_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-+      fi
-+    done
-+  done
-+done
-+lt_ac_max=0
-+lt_ac_count=0
-+# 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
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -11831,7 +12317,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
+-  test ! -f $lt_ac_sed && break
 +  test ! -f $lt_ac_sed && continue
-+  cat /dev/null > conftest.in
-+  lt_ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+  # Check for GNU sed and select it if it is found.
-+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+    lt_cv_path_SED=$lt_ac_sed
-+    break
-+  fi
-+  while true; do
-+    cat conftest.in conftest.in >conftest.tmp
-+    mv conftest.tmp conftest.in
-+    cp conftest.in conftest.nl
-+    echo >>conftest.nl
-+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+    cmp -s conftest.out conftest.nl || break
-+    # 10000 chars as input seems more than enough
-+    test $lt_ac_count -gt 10 && break
-+    lt_ac_count=`expr $lt_ac_count + 1`
-+    if test $lt_ac_count -gt $lt_ac_max; then
-+      lt_ac_max=$lt_ac_count
-+      lt_cv_path_SED=$lt_ac_sed
-+    fi
-+  done
-+done
-+])
-+SED=$lt_cv_path_SED
-+AC_MSG_RESULT([$SED])
-+])
-+
-+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-+dnl also defines GSTUFF_PKG_ERRORS on error
-+AC_DEFUN([PKG_CHECK_MODULES], [
-+  succeeded=no
-+
-+  if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+  fi
-+
-+  if test "$PKG_CONFIG" = "no" ; then
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+  else
-+     PKG_CONFIG_MIN_VERSION=0.9.0
-+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+        AC_MSG_CHECKING(for $2)
-+
-+        if $PKG_CONFIG --exists "$2" ; then
-+            AC_MSG_RESULT(yes)
-+            succeeded=yes
-+
-+            AC_MSG_CHECKING($1_CFLAGS)
-+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-+            AC_MSG_RESULT($$1_CFLAGS)
-+
-+            AC_MSG_CHECKING($1_LIBS)
-+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-+            AC_MSG_RESULT($$1_LIBS)
-+        else
-+            $1_CFLAGS=""
-+            $1_LIBS=""
-+            ## If we have a custom action on failure, don't print errors, but 
-+            ## do set a variable so people can do so.
-+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-+        fi
-+
-+        AC_SUBST($1_CFLAGS)
-+        AC_SUBST($1_LIBS)
-+     else
-+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+     fi
-+  fi
-+
-+  if test $succeeded = yes; then
-+     ifelse([$3], , :, [$3])
-+  else
-+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-+  fi
-+])
-+
-+
---- aclocal.m4
-+++ aclocal.m4
-@@ -0,0 +1,892 @@
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+# Copyright (C) 2002, 2003, 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.
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2003, 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.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory.  The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run.  This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+#    fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+#    fails if $ac_aux_dir is absolute,
-+#    fails when called from a subdirectory in a VPATH build with
-+#          a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir.  In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+#   MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH.  The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-+
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 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 7
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])
-+AC_SUBST([$1_FALSE])
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+  AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-+
-+
-+# Copyright (C) 1999, 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 8
-+
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery.  Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-+
-+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-+                   [depcc="$$1"   am_compiler_list=])
-+
-+AC_CACHE_CHECK([dependency style of $depcc],
-+               [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_$1_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_$1_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-+
-+
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-+
-+
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])
-+])
-+
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
-+
-+# Copyright (C) 1999, 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 3
-+
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[for mf in $CONFIG_FILES; do
-+  # 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.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # 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
-+    dirpart=`AS_DIRNAME("$mf")`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`AS_DIRNAME(["$file"])`
-+    AS_MKDIR_P([$dirpart/$fdir])
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
-+done
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled.  FIXME.  This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 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 8
-+
-+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-+
-+# Do all the work for Automake.                             -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 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 12
-+
-+# This macro actually does too much.  Some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition.  After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.58])dnl
-+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+	      		     [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+                  [_AM_DEPENDENCIES(CC)],
-+                  [define([AC_PROG_CC],
-+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+                  [_AM_DEPENDENCIES(CXX)],
-+                  [define([AC_PROG_CXX],
-+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+])
-+])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated.  The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $1 | $1:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 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.
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+AC_SUBST(install_sh)])
-+
-+# Copyright (C) 2003, 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 2
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot.  For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+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.
-+#
-+# 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 3
-+
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
-+
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 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
-+
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  AC_MSG_WARN([`missing' script is too old or missing])
-+fi
-+])
-+
-+# Copyright (C) 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.
-+
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-+#
-+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-+# created by `make install' are always world readable, even if the
-+# installer happens to have an overly restrictive umask (e.g. 077).
-+# This was a mistake.  There are at least two reasons why we must not
-+# use `-m 0755':
-+#   - it causes special bits like SGID to be ignored,
-+#   - it may be too restrictive (some setups expect 775 directories).
-+#
-+# Do not use -m 0755 and let people choose whatever they expect by
-+# setting umask.
-+#
-+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-+# Some implementations (such as Solaris 8's) are not thread-safe: if a
-+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-+# concurrently, both version can detect that a/ is missing, but only
-+# one can create it and the other will error out.  Consequently we
-+# restrict ourselves to GNU make (using the --version option ensures
-+# this.)
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # We used to keeping the `.' as first argument, in order to
-+  # allow $(mkdir_p) to be used without argument.  As in
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.  However this is wrong
-+  # for two reasons:
-+  #  1. if the package is installed by a user who cannot write `.'
-+  #     make install will fail,
-+  #  2. the above comment should most certainly read
-+  #     $(mkdir_p) $(DESTDIR)$(somedir)
-+  #     so it does not work when $(somedir) is undefined and
-+  #     $(DESTDIR) is not.
-+  #  To support the latter case, we have to write
-+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+  #  so the `.' trick is pointless.
-+  mkdir_p='mkdir -p --'
-+else
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
-+fi
-+AC_SUBST([mkdir_p])])
-+
-+# Helper functions for option handling.                     -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 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 3
-+
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME.  Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 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
-+
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+   if test "$[*]" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$[*]" != "X $srcdir/configure conftest.file" \
-+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "$[2]" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-+
-+# Copyright (C) 2001, 2003, 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.
-+
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries.  This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+  AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+
-+# Check how to create a tarball.                            -*- Autoconf -*-
-+
-+# Copyright (C) 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 2
-+
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+#     tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+#     $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+     [m4_case([$1], [ustar],, [pax],,
-+              [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+  case $_am_tool in
-+  gnutar)
-+    for _am_tar in tar gnutar gtar;
-+    do
-+      AM_RUN_LOG([$_am_tar --version]) && break
-+    done
-+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+    am__untar="$_am_tar -xf -"
-+    ;;
-+  plaintar)
-+    # Must skip GNU tar: if it does not support --format= it doesn't create
-+    # ustar tarball either.
-+    (tar --version) >/dev/null 2>&1 && continue
-+    am__tar='tar chf - "$$tardir"'
-+    am__tar_='tar chf - "$tardir"'
-+    am__untar='tar xf -'
-+    ;;
-+  pax)
-+    am__tar='pax -L -x $1 -w "$$tardir"'
-+    am__tar_='pax -L -x $1 -w "$tardir"'
-+    am__untar='pax -r'
-+    ;;
-+  cpio)
-+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+    am__untar='cpio -i -H $1 -d'
-+    ;;
-+  none)
-+    am__tar=false
-+    am__tar_=false
-+    am__untar=false
-+    ;;
-+  esac
-+
-+  # If the value was cached, stop now.  We just wanted to have am__tar
-+  # and am__untar set.
-+  test -n "${am_cv_prog_tar_$1}" && break
-+
-+  # tar/untar a dummy directory, and stop if the command works
-+  rm -rf conftest.dir
-+  mkdir conftest.dir
-+  echo GrepMe > conftest.dir/file
-+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+  rm -rf conftest.dir
-+  if test -s conftest.tar; then
-+    AM_RUN_LOG([$am__untar <conftest.tar])
-+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+  fi
-+done
-+rm -rf conftest.dir
-+
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-+
-+m4_include([acinclude.m4])
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 --- applnk/compat/Makefile.in
 +++ applnk/compat/Makefile.in
-@@ -0,0 +1,836 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+#Desktop files provided for backwards compatibility
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = applnk/compat
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(applnk_compat_datadir)"
-+applnk_compat_dataDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(applnk_compat_data_DATA)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -119,6 +119,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -262,6 +263,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -312,6 +316,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -319,12 +324,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -345,10 +347,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -357,6 +362,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -518,6 +524,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -525,10 +532,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+applnk_compat_data_DATA = battery.desktop bwarning.desktop cwarning.desktop \
-+	power.desktop kcmkonq.desktop kcmkxmlrpcd.desktop	\
-+	konqhtml.desktop socks.desktop virtualdesktops.desktop \
-+	email.desktop userinfo.desktop passwords.desktop
-+
-+applnk_compat_datadir = $(kde_appsdir)/.hidden
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  applnk/compat/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  applnk/compat/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  applnk/compat/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  applnk/compat/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit applnk/compat/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -597,9 +606,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+install-applnk_compat_dataDATA: $(applnk_compat_data_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(applnk_compat_datadir)" || $(mkdir_p) "$(DESTDIR)$(applnk_compat_datadir)"
-+	@list='$(applnk_compat_data_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(applnk_compat_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(applnk_compat_datadir)/$$f'"; \
-+	  $(applnk_compat_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(applnk_compat_datadir)/$$f"; \
-+	done
-+
-+uninstall-applnk_compat_dataDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(applnk_compat_data_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(applnk_compat_datadir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(applnk_compat_datadir)/$$f"; \
-+	done
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(DATA)
-+installdirs:
-+	for dir in "$(DESTDIR)$(applnk_compat_datadir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-applnk_compat_dataDATA
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-applnk_compat_dataDATA uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-applnk_compat_dataDATA install-data install-data-am \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-+	ps ps-am uninstall uninstall-am \
-+	uninstall-applnk_compat_dataDATA uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=kcmkxmlrpcd.desktop bwarning.desktop virtualdesktops.desktop cwarning.desktop battery.desktop socks.desktop Makefile.in kcmkonq.desktop passwords.desktop email.desktop konqhtml.desktop userinfo.desktop Makefile.am power.desktop 
-+
-+#>+ 2
-+docs-am:
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  applnk/compat/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  applnk/compat/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit applnk/compat/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- applnk/Makefile.in
 +++ applnk/Makefile.in
-@@ -0,0 +1,1103 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = applnk
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(xdg_directorydir)" \
-+	"$(DESTDIR)$(xdg_menudir)" "$(DESTDIR)$(xdg_mergedmenudir)"
-+xdg_directoryDATA_INSTALL = $(INSTALL_DATA)
-+xdg_menuDATA_INSTALL = $(INSTALL_DATA)
-+xdg_mergedmenuDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(xdg_directory_DATA) $(xdg_menu_DATA) $(xdg_mergedmenu_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -136,6 +136,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -279,6 +280,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -329,6 +333,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -336,12 +341,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,10 +364,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -374,6 +379,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -535,6 +541,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -542,10 +549,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+SUBDIRS = compat
-+xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
-+xdg_mergedmenu_DATA = kde-essential.menu
-+xdg_mergedmenudir = $(xdg_menudir)/applications-merged
-+xdg_directory_DATA = \
-+kde-main.directory \
-+kde-development.directory \
-+kde-editors.directory \
-+kde-edutainment.directory \
-+kde-games-arcade.directory \
-+kde-games-board.directory \
-+kde-games-card.directory \
-+kde-games-kids.directory \
-+kde-games-roguelikes.directory \
-+kde-games-strategy.directory \
-+kde-games.directory \
-+kde-graphics.directory \
-+kde-information.directory \
-+kde-internet-terminal.directory \
-+kde-internet.directory \
-+kde-more.directory \
-+kde-multimedia.directory \
-+kde-office.directory \
-+kde-science.directory \
-+kde-settings-accessibility.directory \
-+kde-settings-components.directory \
-+kde-settings-desktop.directory \
-+kde-settings-looknfeel.directory \
-+kde-settings-network.directory \
-+kde-settings-peripherals.directory \
-+kde-settings-hardware.directory \
-+kde-settings-power.directory \
-+kde-settings-security.directory \
-+kde-settings-sound.directory \
-+kde-settings-system.directory \
-+kde-settings-webbrowsing.directory \
-+kde-settings.directory \
-+kde-settingsmenu.directory \
-+kde-system-screensavers.directory \
-+kde-system-terminal.directory \
-+kde-system.directory \
-+kde-toys.directory \
-+kde-unknown.directory \
-+kde-utilities-xutils.directory \
-+kde-utilities.directory \
-+kde-utilities-accessibility.directory \
-+kde-utilities-desktop.directory \
-+kde-utilities-peripherals.directory \
-+kde-utilities-file.directory \
-+kde-utilities-pim.directory \
-+kde-development-translation.directory \
-+kde-development-webdevelopment.directory
-+
-+#>- all: all-recursive
-+#>+ 1
-+all: docs-am  all-recursive
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -623,7 +632,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  applnk/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  applnk/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  applnk/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  applnk/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit applnk/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -661,9 +670,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+install-xdg_directoryDATA: $(xdg_directory_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(xdg_directorydir)" || $(mkdir_p) "$(DESTDIR)$(xdg_directorydir)"
-+	@list='$(xdg_directory_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(xdg_directoryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdg_directorydir)/$$f'"; \
-+	  $(xdg_directoryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdg_directorydir)/$$f"; \
-+	done
-+
-+uninstall-xdg_directoryDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(xdg_directory_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(xdg_directorydir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(xdg_directorydir)/$$f"; \
-+	done
-+install-xdg_menuDATA: $(xdg_menu_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(xdg_menudir)" || $(mkdir_p) "$(DESTDIR)$(xdg_menudir)"
-+	@list='$(xdg_menu_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(xdg_menuDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdg_menudir)/$$f'"; \
-+	  $(xdg_menuDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdg_menudir)/$$f"; \
-+	done
-+
-+uninstall-xdg_menuDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(xdg_menu_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(xdg_menudir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(xdg_menudir)/$$f"; \
-+	done
-+install-xdg_mergedmenuDATA: $(xdg_mergedmenu_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(xdg_mergedmenudir)" || $(mkdir_p) "$(DESTDIR)$(xdg_mergedmenudir)"
-+	@list='$(xdg_mergedmenu_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(xdg_mergedmenuDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdg_mergedmenudir)/$$f'"; \
-+	  $(xdg_mergedmenuDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdg_mergedmenudir)/$$f"; \
-+	done
-+
-+uninstall-xdg_mergedmenuDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(xdg_mergedmenu_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(xdg_mergedmenudir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(xdg_mergedmenudir)/$$f"; \
-+	done
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile $(DATA)
-+installdirs: installdirs-recursive
-+installdirs-am:
-+	for dir in "$(DESTDIR)$(xdg_directorydir)" "$(DESTDIR)$(xdg_menudir)" "$(DESTDIR)$(xdg_mergedmenudir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-recursive
-+#>+ 1
-+clean: kde-rpo-clean  clean-recursive
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-recursive
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool \
-+	distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+html: html-recursive
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am: install-data-local install-xdg_directoryDATA \
-+	install-xdg_menuDATA install-xdg_mergedmenuDATA
-+
-+install-exec-am:
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-local \
-+	uninstall-xdg_directoryDATA uninstall-xdg_menuDATA \
-+	uninstall-xdg_mergedmenuDATA
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
-+	ctags-recursive distclean distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-data-local install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-strip install-xdg_directoryDATA install-xdg_menuDATA \
-+	install-xdg_mergedmenuDATA installcheck installcheck-am \
-+	installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am uninstall-local \
-+	uninstall-xdg_directoryDATA uninstall-xdg_menuDATA \
-+	uninstall-xdg_mergedmenuDATA
-+
-+
-+install-data-local:
-+	for file in `cat $(srcdir)/old_desktop_files` ; do \
-+	    if test -f $(DESTDIR)$(xdg_appsdir)/$${file} ; then \
-+	        rm $(DESTDIR)$(xdg_appsdir)/$${file} ; \
-+		echo Deleting $(DESTDIR)$(xdg_appsdir)/$${file} ; \
-+	    fi; \
-+	done;
-+
-+	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)
-+	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/.hidden
-+	$(INSTALL_DATA) $(srcdir)/hidden.directory $(DESTDIR)$(kde_appsdir)/.hidden/.directory
-+
-+uninstall-local:
-+	-rm -f $(DESTDIR)$(kde_appsdir)/.hidden/.directory
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-utilities-file.directory kde-games-arcade.directory kde-games.directory kde-settings-accessibility.directory kde-settings-security.directory kde-utilities-accessibility.directory kde-settings-network.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-development-webdevelopment.directory kde-toys.directory kde-system-screensavers.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-information.menu kde-office.directory kde-games-card.directory kde-development.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-utilities-desktop.directory kde-games-kids.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory hidden.directory kde-graphics.directory kde-development-translation.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-science.directory kde-settings.directory kde-utilities-peripherals.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-utilities-pim.directory Makefile.am kde-multimedia.directory kde-games-strategy.directory kde-settings-peripherals.directory 
-+
-+#>+ 2
-+docs-am:
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  applnk/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  applnk/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit applnk/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-recursive
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- config.h.in
 +++ config.h.in
-@@ -0,0 +1,966 @@
-+/* config.h.in.  Generated from configure.in by autoheader.  */
-+
-+/* define if you have KTH Kerberos IV and AFS */
-+#undef AFS
-+
-+/* Define if the system uses a BSD-style init */
-+#undef BSD_INIT
-+
-+/* Define if the system has no getutent */
-+#undef BSD_UTMP
-+
-+/* media HAL backend compilation */
-+#undef COMPILE_HALBACKEND
-+
-+/* media linux cd polling compilation */
-+#undef COMPILE_LINUXCDPOLLING
-+
-+/* Define if covariant return in virtual methods works */
-+#undef COVARIANT_RETURN_BROKEN
-+
-+/* Define the unix domain path for dbus system bus */
-+#undef DBUS_SYSTEM_BUS
-+
-+/* Use su or sudo */
-+#undef DEFAULT_SUPER_USER_COMMAND
-+
-+/* Define the system's entropy device */
-+#undef DEV_RANDOM
-+
-+/* Define to the type of elements in the array set by `getgroups'. Usually
-+   this is either `int' or `gid_t'. */
-+#undef GETGROUPS_T
-+
-+/* Define if kdm should be built with XDMAUTH support */
-+#undef HASXDMAUTH
-+
-+/* Define to 1 if you have the <Alib.h> header file. */
-+#undef HAVE_ALIB_H
-+
-+/* Define to 1 if you have the `arc4random' function. */
-+#undef HAVE_ARC4RANDOM
-+
-+/* Defined for arts support in khotkeys */
-+#undef HAVE_ARTS
-+
-+/* Define to 1 if you have the `auth_timeok' function. */
-+#undef HAVE_AUTH_TIMEOK
-+
-+/* You _must_ have bool */
-+#undef HAVE_BOOL
-+
-+/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
-+#undef HAVE_CARBON_CARBON_H
-+
-+/* Define if you have the CoreAudio API */
-+#undef HAVE_COREAUDIO
-+
-+/* Define to 1 if you have the <crt_externs.h> header file. */
-+#undef HAVE_CRT_EXTERNS_H
-+
-+/* Defines if your system has the crypt function */
-+#undef HAVE_CRYPT
-+
-+/* Define to 1 if you have the <crypt.h> header file. */
-+#undef HAVE_CRYPT_H
-+
-+/* Define to 1 if you have the <devinfo.h> header file. */
-+#undef HAVE_DEVINFO_H
-+
-+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-+   */
-+#undef HAVE_DIRENT_H
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Define if dns-sd is available */
-+#undef HAVE_DNSSD
-+
-+/* Define if you have DPMS support */
-+#undef HAVE_DPMS
-+
-+/* Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h> */
-+#undef HAVE_DPMSCAPABLE_PROTO
-+
-+/* Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h> */
-+#undef HAVE_DPMSINFO_PROTO
-+
-+/* Define if you have OpenEXR */
-+#undef HAVE_EXR
-+
-+/* Define to 1 if you have the <floatingpoint.h> header file. */
-+#undef HAVE_FLOATINGPOINT_H
-+
-+/* Define to 1 if you have the <float.h> header file. */
-+#undef HAVE_FLOAT_H
-+
-+/* Defines if your system has the libfontconfig library */
-+#undef HAVE_FONTCONFIG
-+
-+/* Defines if you have FontEnc */
-+#undef HAVE_FONT_ENC
-+
-+/* Define to 1 if you have the <fstab.h> header file. */
-+#undef HAVE_FSTAB_H
-+
-+/* Define if you have getdomainname */
-+#undef HAVE_GETDOMAINNAME
-+
-+/* Define if you have the getdomainname prototype */
-+#undef HAVE_GETDOMAINNAME_PROTO
-+
-+/* Define to 1 if you have the `getdtablesize' function. */
-+#undef HAVE_GETDTABLESIZE
-+
-+/* Define to 1 if you have the `getgroups' function. */
-+#undef HAVE_GETGROUPS
-+
-+/* Define if you have gethostname */
-+#undef HAVE_GETHOSTNAME
-+
-+/* Define if you have the gethostname prototype */
-+#undef HAVE_GETHOSTNAME_PROTO
-+
-+/* Define to 1 if you have the `getifaddrs' function. */
-+#undef HAVE_GETIFADDRS
-+
-+/* Define to 1 if you have the `getnameinfo' function. */
-+#undef HAVE_GETNAMEINFO
-+
-+/* Define to 1 if you have the `getpassphrase' function. */
-+#undef HAVE_GETPASSPHRASE
-+
-+/* Define to 1 if you have the `getpeereid' function. */
-+#undef HAVE_GETPEEREID
-+
-+/* Define to 1 if you have the `getpt' function. */
-+#undef HAVE_GETPT
-+
-+/* Define to 1 if you have the `getttyent' function. */
-+#undef HAVE_GETTTYENT
-+
-+/* Define to 1 if you have the `getusershell' function. */
-+#undef HAVE_GETUSERSHELL
-+
-+/* Defines if you have GL (Mesa, OpenGL, ...) */
-+#undef HAVE_GL
-+
-+/* Define if you have glXChooseVisual() */
-+#undef HAVE_GLXCHOOSEVISUAL
-+
-+/* Define to 1 if you have the `grantpt' function. */
-+#undef HAVE_GRANTPT
-+
-+/* Define to 1 if you have the <ieeefp.h> header file. */
-+#undef HAVE_IEEEFP_H
-+
-+/* Define to 1 if you have the `initgroups' function. */
-+#undef HAVE_INITGROUPS
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define to 1 if you have the `isastream' function. */
-+#undef HAVE_ISASTREAM
-+
-+/* Defines if you have Solaris' libkstat */
-+#undef HAVE_KSTAT
-+
-+/* Define to 1 if you have the <lastlog.h> header file. */
-+#undef HAVE_LASTLOG_H
-+
-+/* Defines if your system has the libart library */
-+#undef HAVE_LIBART
-+
-+/* Defines if you have libdevinfo of Solaris 7 or later */
-+#undef HAVE_LIBDEVINFO_H
-+
-+/* Define if you have libjpeg */
-+#undef HAVE_LIBJPEG
-+
-+/* Define if you have LDAP libraries */
-+#undef HAVE_LIBLDAP
-+
-+/* Define if you have libpng */
-+#undef HAVE_LIBPNG
-+
-+/* Define if you have a working libpthread (will enable threaded code) */
-+#undef HAVE_LIBPTHREAD
-+
-+/* Define if you have cyrus-sasl2 libraries */
-+#undef HAVE_LIBSASL2
-+
-+/* Define to 1 if you have the `smbclient' library (-lsmbclient). */
-+#undef HAVE_LIBSMBCLIENT
-+
-+/* Defined if you have libusb */
-+#undef HAVE_LIBUSB
-+
-+/* Define to 1 if you have the <libutil.h> header file. */
-+#undef HAVE_LIBUTIL_H
-+
-+/* Define if you have libz */
-+#undef HAVE_LIBZ
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#undef HAVE_LIMITS_H
-+
-+/* Define to 1 if you have the <linux/raw.h> header file. */
-+#undef HAVE_LINUX_RAW_H
-+
-+/* Define to 1 if you have the <login_cap.h> header file. */
-+#undef HAVE_LOGIN_CAP_H
-+
-+/* Define to 1 if you have the `login_getclass' function. */
-+#undef HAVE_LOGIN_GETCLASS
-+
+@@ -215,10 +215,14 @@
+ /* Define to 1 if you have the `login_getclass' function. */
+ #undef HAVE_LOGIN_GETCLASS
+ 
+-/* Define to 1 if long double works and has more range or precision than
+-   double. */
 +/* Define to 1 if the type `long double' works and has more range or precision
 +   than `double'. */
-+#undef HAVE_LONG_DOUBLE
-+
+ #undef HAVE_LONG_DOUBLE
+ 
 +/* Define to 1 if the type `long double' works and has more range or precision
 +   than `double'. */
 +#undef HAVE_LONG_DOUBLE_WIDER
 +
-+/* Define if you have long long as datatype */
-+#undef HAVE_LONG_LONG
-+
-+/* Define to 1 if you have the <math.h> header file. */
-+#undef HAVE_MATH_H
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if you have the `mkstemp' function. */
-+#undef HAVE_MKSTEMP
-+
-+/* Define if you have mkstemps */
-+#undef HAVE_MKSTEMPS
-+
-+/* Define if you have the mkstemps prototype */
-+#undef HAVE_MKSTEMPS_PROTO
-+
-+/* Define to 1 if you have the <mntent.h> header file. */
-+#undef HAVE_MNTENT_H
-+
-+/* Define to 1 if you have the <nan.h> header file. */
-+#undef HAVE_NAN_H
-+
-+/* Define to 1 if you have the <ncurses.h> header file. */
-+#undef HAVE_NCURSES_H
-+
-+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-+#undef HAVE_NDIR_H
-+
-+/* Define to 1 if you have the `nice' function. */
-+#undef HAVE_NICE
-+
-+/* Define if your system needs _NSGetEnviron to set up the environment */
-+#undef HAVE_NSGETENVIRON
-+
-+/* Define if you have OpenSSL < 0.9.6 */
-+#undef HAVE_OLD_SSL_API
-+
-+/* Defines whether we can use the openpty() function */
-+#undef HAVE_OPENPTY
-+
-+/* Defines if you have PAM (Pluggable Authentication Modules) */
-+#undef HAVE_PAM
-+
-+/* Define if your PAM headers are in pam/ instead of security/ */
-+#undef HAVE_PAM_PAM_APPL_H
-+
-+/* Define to 1 if you have the <paths.h> header file. */
-+#undef HAVE_PATHS_H
-+
-+/* Define to 1 if you have the `powl' function. */
-+#undef HAVE_POWL
-+
-+/* Defines whether /proc/`pid`/cwd exists */
-+#undef HAVE_PROC_CWD
-+
-+/* Define to 1 if you have the `ptsname' function. */
-+#undef HAVE_PTSNAME
-+
-+/* Define to 1 if you have the <pty.h> header file. */
-+#undef HAVE_PTY_H
-+
-+/* Define to 1 if you have the `pw_encrypt' function. */
-+#undef HAVE_PW_ENCRYPT
-+
-+/* Define if you have random */
-+#undef HAVE_RANDOM
-+
-+/* Define if you have the random prototype */
-+#undef HAVE_RANDOM_PROTO
-+
-+/* Define if you have res_init */
-+#undef HAVE_RES_INIT
-+
-+/* Define if you have the res_init prototype */
-+#undef HAVE_RES_INIT_PROTO
-+
-+/* Define to 1 if you have the <sasl.h> header file. */
-+#undef HAVE_SASL_H
-+
-+/* Define to 1 if you have the <sasl/sasl.h> header file. */
-+#undef HAVE_SASL_SASL_H
-+
-+/* Define to 1 if you have the <sensors/sensors.h> header file. */
-+#undef HAVE_SENSORS_SENSORS_H
-+
-+/* Define if you have setenv */
-+#undef HAVE_SETENV
-+
-+/* Define if you have the setenv prototype */
-+#undef HAVE_SETENV_PROTO
-+
-+/* Define to 1 if you have the `seteuid' function. */
-+#undef HAVE_SETEUID
-+
-+/* Define to 1 if you have the `setgroups' function. */
-+#undef HAVE_SETGROUPS
-+
-+/* Define to 1 if you have the `setlogin' function. */
-+#undef HAVE_SETLOGIN
-+
-+/* Define to 1 if you have the `setpgid' function. */
-+#undef HAVE_SETPGID
-+
-+/* Define to 1 if you have the `setpriority' function. */
-+#undef HAVE_SETPRIORITY
-+
-+/* Define to 1 if you have the `setproctitle' function. */
-+#undef HAVE_SETPROCTITLE
-+
-+/* Define if you have setupterm in -l(n)curses */
-+#undef HAVE_SETUPTERM
-+
-+/* Define to 1 if you have the `setusercontext' function. */
-+#undef HAVE_SETUSERCONTEXT
-+
-+/* Define if you have a STL implementation by SGI */
-+#undef HAVE_SGI_STL
-+
-+/* Define if you use shadow passwords */
-+#undef HAVE_SHADOW
-+
-+/* Define to 1 if you have the `sigaction' function. */
-+#undef HAVE_SIGACTION
-+
-+/* Define to 1 if you have the `sigset' function. */
-+#undef HAVE_SIGSET
-+
-+/* Define to 1 if you have the `snprintf' function. */
-+#undef HAVE_SNPRINTF
-+
-+/* Define to 1 if you have the `socket' function. */
-+#undef HAVE_SOCKET
-+
-+/* Define to 1 if you have the `sqrtl' function. */
-+#undef HAVE_SQRTL
-+
-+/* Define if you have srandom */
-+#undef HAVE_SRANDOM
-+
-+/* Define if you have the srandom prototype */
-+#undef HAVE_SRANDOM_PROTO
-+
-+/* If we are going to use OpenSSL */
-+#undef HAVE_SSL
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the `strdup' function. */
-+#undef HAVE_STRDUP
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define if you have strlcat */
-+#undef HAVE_STRLCAT
-+
-+/* Define if you have the strlcat prototype */
-+#undef HAVE_STRLCAT_PROTO
-+
-+/* Define if you have strlcpy */
-+#undef HAVE_STRLCPY
-+
-+/* Define if you have the strlcpy prototype */
-+#undef HAVE_STRLCPY_PROTO
-+
-+/* Define to 1 if you have the `strnlen' function. */
-+#undef HAVE_STRNLEN
-+
-+/* Define to 1 if you have the <stropts.h> header file. */
-+#undef HAVE_STROPTS_H
-+
-+/* Define to 1 if `pw_expire' is member of `struct passwd'. */
-+#undef HAVE_STRUCT_PASSWD_PW_EXPIRE
-+
-+/* Define to 1 if `sin_len' is member of `struct sockaddr_in'. */
-+#undef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-+
-+/* Define to 1 if `sa_len' is member of `struct sockaddr'. */
-+#undef HAVE_STRUCT_SOCKADDR_SA_LEN
-+
-+/* Define if you have the struct ucred */
-+#undef HAVE_STRUCT_UCRED
-+
-+/* Define to 1 if `ut_user' is member of `struct utmp'. */
-+#undef HAVE_STRUCT_UTMP_UT_USER
-+
-+/* Define to 1 if you have the `sysinfo' function. */
-+#undef HAVE_SYSINFO
-+
-+/* Define to 1 if you have the <syslog.h> header file. */
-+#undef HAVE_SYSLOG_H
-+
-+/* Define to 1 if you have the <sys/bitypes.h> header file. */
-+#undef HAVE_SYS_BITYPES_H
-+
-+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-+   */
-+#undef HAVE_SYS_DIR_H
-+
-+/* Define to 1 if you have the <sys/ioctl.h> header file. */
-+#undef HAVE_SYS_IOCTL_H
-+
-+/* Define to 1 if you have the <sys/loadavg.h> header file. */
-+#undef HAVE_SYS_LOADAVG_H
-+
-+/* Define to 1 if you have the <sys/mount.h> header file. */
-+#undef HAVE_SYS_MOUNT_H
-+
-+/* Define to 1 if you have the <sys/m_wait.h> header file. */
-+#undef HAVE_SYS_M_WAIT_H
-+
-+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-+   */
-+#undef HAVE_SYS_NDIR_H
-+
-+/* Define to 1 if you have the <sys/raw.h> header file. */
-+#undef HAVE_SYS_RAW_H
-+
-+/* Define to 1 if you have the <sys/select.h> header file. */
-+#undef HAVE_SYS_SELECT_H
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+#undef HAVE_SYS_SOCKET_H
-+
-+/* Define to 1 if you have the <sys/sockio.h> header file. */
-+#undef HAVE_SYS_SOCKIO_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/stropts.h> header file. */
-+#undef HAVE_SYS_STROPTS_H
-+
-+/* Define to 1 if you have the <sys/termios.h> header file. */
-+#undef HAVE_SYS_TERMIOS_H
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#undef HAVE_SYS_TIME_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have the <sys/ucred.h> header file. */
-+#undef HAVE_SYS_UCRED_H
-+
-+/* Define to 1 if you have the <sys/wait.h> header file. */
-+#undef HAVE_SYS_WAIT_H
-+
-+/* Define if sys/stat.h declares S_ISSOCK. */
-+#undef HAVE_S_ISSOCK
-+
-+/* Define to 1 if you have the <termios.h> header file. */
-+#undef HAVE_TERMIOS_H
-+
-+/* Define to 1 if you have the <termio.h> header file. */
-+#undef HAVE_TERMIO_H
-+
-+/* Define to 1 if you have the <time.h> header file. */
-+#undef HAVE_TIME_H
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Define to 1 if you have the `unlockpt' function. */
-+#undef HAVE_UNLOCKPT
-+
-+/* Define if you have unsetenv */
-+#undef HAVE_UNSETENV
-+
-+/* Define if you have the unsetenv prototype */
-+#undef HAVE_UNSETENV_PROTO
-+
-+/* Define if you have usleep */
-+#undef HAVE_USLEEP
-+
-+/* Define if you have the usleep prototype */
-+#undef HAVE_USLEEP_PROTO
-+
-+/* Define to 1 if you have the <util.h> header file. */
-+#undef HAVE_UTIL_H
-+
-+/* Define if the system uses extended utmp */
-+#undef HAVE_UTMPX
-+
-+/* Define to 1 if you have the <vfork.h> header file. */
-+#undef HAVE_VFORK_H
-+
-+/* Define to 1 if you have the `vsnprintf' function. */
-+#undef HAVE_VSNPRINTF
-+
-+/* Define to 1 if you have the `vsyslog' function. */
-+#undef HAVE_VSYSLOG
-+
-+/* Define to 1 if you have the `waitpid' function. */
-+#undef HAVE_WAITPID
-+
-+/* Define to 1 if you have the <X11/extensions/Xcomposite.h> header file. */
-+#undef HAVE_X11_EXTENSIONS_XCOMPOSITE_H
-+
-+/* Define to 1 if you have the <X11/extensions/Xdamage.h> header file. */
-+#undef HAVE_X11_EXTENSIONS_XDAMAGE_H
-+
-+/* Define to 1 if you have the <X11/extensions/Xrandr.h> header file. */
-+#undef HAVE_X11_EXTENSIONS_XRANDR_H
-+
-+/* Define to 1 if you have the <X11/extensions/Xrender.h> header file. */
-+#undef HAVE_X11_EXTENSIONS_XRENDER_H
-+
-+/* Define to 1 if you have the <X11/Xcursor/Xcursor.h> header file. */
-+#undef HAVE_X11_XCURSOR_XCURSOR_H
-+
-+/* Define if you have the XComposite extension */
-+#undef HAVE_XCOMPOSITE
-+
-+/* Define to 1 if you have Xcursor */
-+#undef HAVE_XCURSOR
-+
-+/* Define if you have the xf86misc extension */
-+#undef HAVE_XF86MISC
-+
-+/* Define if you have XF86MiscSetGrabKeysState() */
-+#undef HAVE_XF86MISCSETGRABKEYSSTATE
-+
-+/* Define if you have the XFixes extension */
-+#undef HAVE_XFIXES
-+
-+/* Defines if you have Xft */
-+#undef HAVE_XFT
-+
-+/* Define if you have the Xinerama extension */
-+#undef HAVE_XINERAMA
-+
-+/* Define if you have the XKB extension */
-+#undef HAVE_XKB
-+
-+/* Define if you have XkbSetPerClientControls */
-+#undef HAVE_XKBSETPERCLIENTCONTROLS
-+
-+/* Defined if your system has XRender support */
-+#undef HAVE_XRENDER
-+
-+/* Define if you have the XScreenSaver extension */
-+#undef HAVE_XSCREENSAVER
-+
-+/* Define if you have the XTest extension */
-+#undef HAVE_XTEST
-+
-+/* Define to 1 if you have the `_IceTransNoListen' function. */
-+#undef HAVE__ICETRANSNOLISTEN
-+
-+/* Define if kdm should use Kerberos 5 for Xauth cookies. */
-+#undef K5AUTH
-+
-+/* The PAM service to be used by kcheckpass */
-+#undef KCHECKPASS_PAM_SERVICE
-+
-+/* Suffix for lib directories */
-+#undef KDELIBSUFF
-+
-+/* Define a safe value for MAXPATHLEN */
-+#undef KDEMAXPATHLEN
-+
-+/* KDE's binaries directory */
-+#undef KDE_BINDIR
-+
-+/* KDE's configuration directory */
-+#undef KDE_CONFDIR
-+
-+/* KDE's static data directory */
-+#undef KDE_DATADIR
-+
-+/* Use mallinfo field hblkhd */
-+#undef KDE_MALLINFO_FIELD_hblkhd
-+
-+/* Use mallinfo field uordblks */
-+#undef KDE_MALLINFO_FIELD_uordblks
-+
-+/* Use mallinfo field usmblks */
-+#undef KDE_MALLINFO_FIELD_usmblks
-+
-+/* mallinfo() is available in <malloc.h> */
-+#undef KDE_MALLINFO_MALLOC
-+
-+/* mallinfo() is available in <stdlib.h> */
-+#undef KDE_MALLINFO_STDLIB
-+
-+/* The PAM service to be used by kdm */
-+#undef KDM_PAM_SERVICE
-+
-+/* Define if kdm should use Kerberos IV */
-+#undef KERBEROS
-+
-+/* define if you have Kerberos IV */
-+#undef KRB4
-+
-+/* The PAM service to be used by kscreensaver */
-+#undef KSCREENSAVER_PAM_SERVICE
-+
-+/* Define if the libbz2 functions need the BZ2_ prefix */
-+#undef NEED_BZ2_PREFIX
-+
-+/* Define if kdm should not use AFS */
-+#undef NO_AFS
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* Define if your PAM support takes non-const arguments (Solaris) */
-+#undef PAM_MESSAGE_NONCONST
-+
-+/* Define where your java executable is */
-+#undef PATH_JAVA
-+
-+/* Define if kdm should use Sun's secure RPC for Xauth cookies. */
-+#undef SECURE_RPC
-+
+ /* Define if you have long long as datatype */
+ #undef HAVE_LONG_LONG
+ 
+@@ -659,25 +663,25 @@
+ /* Define if kdm should use Sun's secure RPC for Xauth cookies. */
+ #undef SECURE_RPC
+ 
+-/* The size of a `char', as computed by sizeof. */
 +/* The size of `char', as computed by sizeof. */
-+#undef SIZEOF_CHAR
-+
+ #undef SIZEOF_CHAR
+ 
+-/* The size of a `char *', as computed by sizeof. */
 +/* The size of `char *', as computed by sizeof. */
-+#undef SIZEOF_CHAR_P
-+
+ #undef SIZEOF_CHAR_P
+ 
+-/* The size of a `int', as computed by sizeof. */
 +/* The size of `int', as computed by sizeof. */
-+#undef SIZEOF_INT
-+
+ #undef SIZEOF_INT
+ 
+-/* The size of a `long', as computed by sizeof. */
 +/* The size of `long', as computed by sizeof. */
-+#undef SIZEOF_LONG
-+
+ #undef SIZEOF_LONG
+ 
+-/* The size of a `short', as computed by sizeof. */
 +/* The size of `short', as computed by sizeof. */
-+#undef SIZEOF_SHORT
-+
+ #undef SIZEOF_SHORT
+ 
+-/* The size of a `size_t', as computed by sizeof. */
 +/* The size of `size_t', as computed by sizeof. */
-+#undef SIZEOF_SIZE_T
-+
+ #undef SIZEOF_SIZE_T
+ 
+-/* The size of a `unsigned long', as computed by sizeof. */
 +/* The size of `unsigned long', as computed by sizeof. */
-+#undef SIZEOF_UNSIGNED_LONG
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#undef TIME_WITH_SYS_TIME
-+
-+/* Path for the usb.ids file to use */
-+#undef USBIDS_FILE
-+
-+/* Define if kdm should use shadow passwords */
-+#undef USESHADOW
-+
-+/* Define if kdm should use PAM */
-+#undef USE_PAM
-+
-+/* Define if kdm should be built with syslog support */
-+#undef USE_SYSLOG
-+
-+/* Define the file for utmp entries */
-+#undef UTMP
-+
-+/* Define if you want to use utmp entries */
-+#undef UTMP_SUPPORT
-+
-+/* Version number of package */
-+#undef VERSION
-+
-+/* Defined if compiling without arts */
-+#undef WITHOUT_ARTS
-+
-+/* Build kdm with built-in xconsole */
-+#undef WITH_KDM_XCONSOLE
-+
-+/* Define to 1 if your processor stores words with the most significant byte
-+   first (like Motorola and SPARC, unlike Intel and VAX). */
-+#undef WORDS_BIGENDIAN
-+
-+/* X binaries directory */
-+#undef XBINDIR
-+
-+/* Define if kdm should be built with XDMCP support */
-+#undef XDMCP
-+
-+/* X libraries directory */
-+#undef XLIBDIR
-+
-+/* Defined if your system has XRandR support */
-+#undef XRANDR_SUPPORT
-+
-+/*
-+ * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
-+ * headers and I'm too lazy to write a configure test as long as only
-+ * unixware is related
-+ */
-+#ifdef _UNIXWARE
-+#define HAVE_BOOLEAN
-+#endif
-+
-+
-+
-+/*
-+ * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
-+ * that defines bzero.
-+ */
-+
-+#if defined(_AIX)
-+#include <strings.h>
-+#endif
-+
-+
-+
-+#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-+# include <sys/time.h>
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#endif
-+
-+
-+/* Number of bits in a file offset, on hosts where this is settable. */
-+#undef _FILE_OFFSET_BITS
-+
-+
-+#if !defined(HAVE_GETDOMAINNAME_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+#include <sys/types.h>
-+		int getdomainname (char *, size_t);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-+
-+#if !defined(HAVE_GETHOSTNAME_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+int gethostname (char *, unsigned int);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-+
-+#if !defined(HAVE_MKSTEMPS_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+int mkstemps(char *, int);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-+
-+#if !defined(HAVE_RANDOM_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+long int random(void);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-+
-+#if !defined(HAVE_RES_INIT_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+int res_init(void);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-+
-+#if !defined(HAVE_SETENV_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+int setenv (const char *, const char *, int);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-+
-+#if !defined(HAVE_SRANDOM_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+void srandom(unsigned int);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-+
-+#if !defined(HAVE_STRLCAT_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+unsigned long strlcat(char*, const char*, unsigned long);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-+
-+#if !defined(HAVE_STRLCPY_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+unsigned long strlcpy(char*, const char*, unsigned long);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-+
-+#if !defined(HAVE_UNSETENV_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+void unsetenv (const char *);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-+
-+#if !defined(HAVE_USLEEP_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+int usleep (unsigned int);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-+
-+#ifndef HAVE_S_ISSOCK
-+#define HAVE_S_ISSOCK
-+#define S_ISSOCK(mode) (1==0)
-+#endif
-+
-+
-+/* Define for large files, on AIX-style hosts. */
-+#undef _LARGE_FILES
-+
-+
-+/*
-+ * On HP-UX, the declaration of vsnprintf() is needed every time !
-+ */
-+
-+#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-+#if __STDC__
-+#include <stdarg.h>
-+#include <stdlib.h>
-+#else
-+#include <varargs.h>
-+#endif
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+int snprintf(char *str, size_t n, char const *fmt, ...);
-+#endif
-+
-+
-+/* define to 1 if -fvisibility is supported */
-+#undef __KDE_HAVE_GCC_VISIBILITY
-+
-+
-+#if defined(__SVR4) && !defined(__svr4__)
-+#define __svr4__ 1
-+#endif
-+
-+
-+
-+#if defined(__osf__) || defined(__APPLE__)
-+#define AVOID_XKB                 /* for konsole to avoid XKB and XTEST */
-+#endif
-+
-+
-+
-+#if !defined(HAVE_SETEUID)
-+#define seteuid(_eu) setresuid(-1, _eu, -1)
-+#endif
-+
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+#undef gid_t
-+
-+/* type to use in place of socklen_t if not defined */
-+#undef kde_socklen_t
-+
-+/* type to use in place of socklen_t if not defined (deprecated, use
-+   kde_socklen_t) */
-+#undef ksize_t
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+#undef uid_t
+ #undef SIZEOF_UNSIGNED_LONG
+ 
+ /* Define to 1 if you have the ANSI C header files. */
 --- configure
 +++ configure
-@@ -0,0 +1,59658 @@
-+#! /bin/sh
-+# Guess values for system-dependent variables and create Makefiles.
+@@ -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.61.
-+#
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# This configure script is free software; the Free Software Foundation
-+# gives unlimited permission to copy, distribute and modify it.
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
-+
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+ ## 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+"$@"}'='"$@"'
+ 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+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
 +  setopt NO_GLOB_SUBST
 +else
 +  case `(set -o) 2>/dev/null` in
@@ -16270,16 +4155,15 @@
 +    PATH_SEPARATOR=:
 +  fi
 +  rm -f conf$$.sh
-+fi
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+fi
-+
-+
+ fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+ 
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+@@ -29,8 +58,43 @@
+ fi
+ 
+ 
 +# IFS
 +# We need space, tab and new line, in precisely that order.  Quoting is
 +# there to prevent editors from complaining about space-tab.
@@ -16313,48 +4197,53 @@
 +  { (exit 1); exit 1; }
 +fi
 +
-+# Work around bugs in pre-3.0 UWIN ksh.
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
 +for as_var in ENV MAIL MAILPATH
 +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 +done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -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
+-    $as_unset $as_var
 +    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+  fi
-+done
-+
-+# Required to use basename.
+   fi
+ done
+ 
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+
-+# Name of the executable.
+   as_basename=basename
+ else
+   as_basename=false
+@@ -63,157 +128,388 @@
+ 
+ 
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
 +as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
 +	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X/"$0" |
+ echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
 +    sed '/^.*\/\([^/][^/]*\)\/*$/{
 +	    s//\1/
 +	    q
@@ -16368,18 +4257,36 @@
 +	    q
 +	  }
 +	  s/.*/./; q'`
-+
+ 
 +# CDPATH.
 +$as_unset CDPATH
-+
-+
+ 
+-# 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
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
 +if test "x$CONFIG_SHELL" = x; then
 +  if (eval ":") 2>/dev/null; then
 +  as_have_required=yes
 +else
 +  as_have_required=no
-+fi
-+
+ fi
+ 
 +  if test $as_have_required = yes && 	 (eval ":
 +(as_func_return () {
 +  (exit \$1)
@@ -16396,7 +4303,23 @@
 +as_func_ret_failure () {
 +  return 1
 +}
-+
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
 +exitcode=0
 +if as_func_success; then
 +  :
@@ -16404,7 +4327,20 @@
 +  exitcode=1
 +  echo as_func_success failed.
 +fi
-+
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
 +if as_func_failure; then
 +  exitcode=1
 +  echo as_func_failure succeeded.
@@ -16440,13 +4376,16 @@
 +  :
 +else
 +  as_candidate_shells=
-+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
 +  case $as_dir in
-+	 /*)
+ 	 /*)
+-	   if ("$as_dir/$as_base" -c '
 +	   for as_base in sh bash ksh sh5; do
 +	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
 +	   done;;
@@ -16547,9 +4486,22 @@
 +test $exitcode = 0) || { (exit 1); exit 1; }
 +
 +(
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
 +  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
 +
 +_ASEOF
@@ -16646,45 +4598,64 @@
 +  as_lineno_2=$LINENO
 +  test "x$as_lineno_1" != "x$as_lineno_2" &&
 +  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+
-+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+  # uniformly replaced by the line number.  The first 'sed' inserts a
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
 +  # line-number line after each line using $LINENO; the second 'sed'
 +  # does the real work.  The second script uses 'N' to pair each
 +  # line-number line with the line containing $LINENO, and appends
 +  # trailing '-' during substitution so that $LINENO is not a special
 +  # case at line end.
-+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
 +  # scripts with optimization help from Paolo Bonzini.  Blame Lee
 +  # E. McMahon (1931-1989) for sed's syntax.  :-)
 +  sed -n '
 +    p
 +    /[$]LINENO/=
 +  ' <$as_myself |
-+    sed '
+     sed '
 +      s/[$]LINENO.*/&-/
 +      t lineno
 +      b
 +      :lineno
-+      N
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
 +      :loop
 +      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-+      t loop
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
 +      s/-\n.*//
-+    ' >$as_me.lineno &&
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
 +  chmod +x "$as_me.lineno" ||
-+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+   { (exit 1); exit 1; }; }
-+
-+  # Don't try to exec as it changes $[0], causing all sort of problems
-+  # (the dirname of $[0] is not the place where we might find the
+     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
 +  # original and so on.  Autoconf is especially sensitive to this).
 +  . "./$as_me.lineno"
-+  # Exit status is that of the last command.
-+  exit
-+}
-+
-+
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 +  as_dirname=dirname
 +else
@@ -16700,46 +4671,55 @@
 +  esac;;
 +*)
 +  ECHO_N='-n';;
-+esac
-+
+ esac
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
 +if test -d conf$$.dir; then
 +  rm -f conf$$.dir/conf$$.file
 +else
 +  rm -f conf$$.dir
 +  mkdir conf$$.dir
 +fi
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
 +  as_ln_s='ln -s'
 +  # ... but there are two gotchas:
 +  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 +  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
 +  # In both cases, we have to default to `cp -p'.
 +  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+    as_ln_s='cp -p'
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s=ln
-+else
-+  as_ln_s='cp -p'
-+fi
+     as_ln_s='cp -p'
+-  else
+-    as_ln_s='ln -s'
+-  fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 +rmdir conf$$.dir 2>/dev/null
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p=:
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+@@ -222,7 +518,28 @@
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
 +if test -x / >/dev/null 2>&1; then
 +  as_test_x='test -x'
 +else
@@ -16762,234 +4742,129 @@
 +  '
 +fi
 +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'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+
-+
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-+  ;;
-+esac
-+
-+echo=${ECHO-echo}
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec $SHELL "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit 0
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
+ 
+ # 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 +548,6 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+ 
+ 
+ # Check that we are running under the correct shell.
+@@ -278,15 +586,15 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+if test -z "$ECHO"; then
-+if test "X${echo_test_string+set}" != Xset; then
-+# find a string as large as possible, as long as the shell can cope with it
-+  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
 +    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
 +       echo_test_string=`eval $cmd` &&
-+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-+    then
-+      break
-+    fi
-+  done
-+fi
-+
-+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+   test "X$echo_testing_string" = "X$echo_test_string"; then
-+  :
-+else
-+  # The Solaris, AIX, and Digital Unix default echo programs unquote
-+  # backslashes.  This makes it impossible to quote backslashes using
-+  #   echo "$something" | sed 's/\\/\\\\/g'
-+  #
-+  # So, first we look for a working echo in the user's PATH.
-+
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for dir in $PATH /usr/ucb; do
-+    IFS="$lt_save_ifs"
-+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      echo="$dir/echo"
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+
-+  if test "X$echo" = Xecho; then
-+    # We didn't find a better echo, so look for alternatives.
-+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      # This shell has a builtin print -r that does the trick.
-+      echo='print -r'
-+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-+      # If we have ksh, try running configure again with it.
-+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+      export ORIGINAL_CONFIG_SHELL
-+      CONFIG_SHELL=/bin/ksh
-+      export CONFIG_SHELL
-+      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-+    else
-+      # Try using printf.
-+      echo='printf %s\n'
-+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+	 test "X$echo_testing_string" = "X$echo_test_string"; then
-+	# Cool, printf works
-+	:
-+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	export CONFIG_SHELL
-+	SHELL="$CONFIG_SHELL"
-+	export SHELL
-+	echo="$CONFIG_SHELL $0 --fallback-echo"
-+      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	echo="$CONFIG_SHELL $0 --fallback-echo"
-+      else
-+	# maybe with a smaller string...
-+	prev=:
-+
-+	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-+	  then
-+	    break
-+	  fi
-+	  prev="$cmd"
-+	done
-+
-+	if test "$prev" != 'sed 50q "$0"'; then
-+	  echo_test_string=`eval $prev`
-+	  export echo_test_string
-+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-+	else
-+	  # Oops.  We lost completely, so just stick with echo.
-+	  echo=echo
-+	fi
-+      fi
-+    fi
-+  fi
-+fi
-+fi
-+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+ECHO=$echo
-+if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-+   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-+fi
-+
-+
-+
-+
-+tagnames=${tagnames+${tagnames},}CXX
-+
-+tagnames=${tagnames+${tagnames},}F77
-+
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+@@ -395,29 +703,26 @@
+ 
+ tagnames=${tagnames+${tagnames},}F77
+ 
 +exec 7<&0 </dev/null 6>&1
 +
-+# Name of the host.
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+#
-+# Initializations.
-+#
-+ac_default_prefix=/usr/local
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+-exec 6>&1
+-
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
 +ac_clean_files=
-+ac_config_libobj_dir=.
+ ac_config_libobj_dir=.
 +LIBOBJS=
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+# Identity of this package.
-+PACKAGE_NAME=
-+PACKAGE_TARNAME=
-+PACKAGE_VERSION=
-+PACKAGE_STRING=
-+PACKAGE_BUGREPORT=
-+
-+ac_unique_file="acinclude.m4"
-+ac_default_prefix=${KDEDIR:-the kde prefix}
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete.  It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+-
+ # Identity of this package.
+ PACKAGE_NAME=
+ PACKAGE_TARNAME=
+@@ -430,42 +735,551 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
 +#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
+ # include <sys/types.h>
+ #endif
+-#if HAVE_SYS_STAT_H
 +#ifdef HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
 +#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
 +# ifdef HAVE_STDLIB_H
-+#  include <stdlib.h>
-+# endif
-+#endif
+ #  include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
 +#ifdef HAVE_STRING_H
 +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-+#  include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
+ #  include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
 +#ifdef HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
 +#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#endif
+ # include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-#  include <stdint.h>
+-# endif
+ #endif
+-#if HAVE_UNISTD_H
 +#ifdef HAVE_STDINT_H
 +# include <stdint.h>
 +#endif
 +#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
-+
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN KDE_BINDIR LIBART_LIBS LIBART_CFLAGS LIBART_RPATH RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE install_usbids_TRUE install_usbids_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_ARTS ARTS_CFLAGS KHOTKEYS_ARTS_SUBDIR LIB_KVM LIB_XCOMPOSITE LIB_XFIXES SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIB_LBER LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING PKG_CONFIG HAL_CFLAGS HAL_LIBS HAL_INCS DBUS_CFLAGS DBUS_LIBS DBUS_INCS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE include_media_halbackend_TRUE include_media_halbackend_FALSE SMBCLIENT_EXTRA_LIBS include_kioslave_smb_TRUE include_kioslave_smb_FALSE LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBHOSTS LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdeeject_SUBDIR_included_TRUE kdeeject_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
 +ac_subst_vars='SHELL
 +PATH_SEPARATOR
 +PACKAGE_NAME
@@ -17484,7 +5359,7 @@
 +kdm_SUBDIR_included_FALSE
 +LIBOBJS
 +LTLIBOBJS'
-+ac_subst_files=''
+ ac_subst_files=''
 +      ac_precious_vars='build_alias
 +host_alias
 +target_alias
@@ -17502,43 +5377,28 @@
 +FFLAGS
 +XMKMF'
 +
-+
-+# Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
-+# The variables have the same names as the options, with
-+# dashes changed to underlines.
-+cache_file=/dev/null
-+exec_prefix=NONE
-+no_create=
-+no_recursion=
-+prefix=NONE
-+program_prefix=NONE
-+program_suffix=NONE
-+program_transform_name=s,x,x,
-+silent=
-+site=
-+srcdir=
-+verbose=
-+x_includes=NONE
-+x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# 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.
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+@@ -492,34 +1306,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.
 +# (The list follows the same order as the GNU Coding Standards.)
-+bindir='${exec_prefix}/bin'
-+sbindir='${exec_prefix}/sbin'
-+libexecdir='${exec_prefix}/libexec'
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
 +datarootdir='${prefix}/share'
 +datadir='${datarootdir}'
-+sysconfdir='${prefix}/etc'
-+sharedstatedir='${prefix}/com'
-+localstatedir='${prefix}/var'
-+includedir='${prefix}/include'
-+oldincludedir='/usr/include'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
 +docdir='${datarootdir}/doc/${PACKAGE}'
 +infodir='${datarootdir}/info'
 +htmldir='${docdir}'
@@ -17548,54 +5408,46 @@
 +libdir='${exec_prefix}/lib'
 +localedir='${datarootdir}/locale'
 +mandir='${datarootdir}/man'
-+
-+ac_prev=
+ 
+ ac_prev=
 +ac_dashdash=
-+for ac_option
-+do
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$ac_prev"; then
+ for ac_option
+ do
+   # If the previous option needs an argument, assign it.
+   if test -n "$ac_prev"; then
+-    eval "$ac_prev=\$ac_option"
 +    eval $ac_prev=\$ac_option
-+    ac_prev=
-+    continue
-+  fi
-+
+     ac_prev=
+     continue
+   fi
+ 
+-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 +  case $ac_option in
 +  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
 +  *)	ac_optarg=yes ;;
 +  esac
-+
-+  # Accept the important Cygnus configure options, so we can diagnose typos.
-+
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+ 
+-  case $ac_option in
 +  case $ac_dashdash$ac_option in
 +  --)
 +    ac_dashdash=yes ;;
-+
-+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-+    ac_prev=bindir ;;
-+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-+    bindir=$ac_optarg ;;
-+
-+  -build | --build | --buil | --bui | --bu)
-+    ac_prev=build_alias ;;
-+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-+    build_alias=$ac_optarg ;;
-+
-+  -cache-file | --cache-file | --cache-fil | --cache-fi \
-+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-+    ac_prev=cache_file ;;
-+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-+    cache_file=$ac_optarg ;;
-+
-+  --config-cache | -C)
-+    cache_file=config.cache ;;
-+
+ 
+   -bindir | --bindir | --bindi | --bind | --bin | --bi)
+     ac_prev=bindir ;;
+@@ -541,33 +1369,45 @@
+   --config-cache | -C)
+     cache_file=config.cache ;;
+ 
+-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
 +  -datadir | --datadir | --datadi | --datad)
-+    ac_prev=datadir ;;
+     ac_prev=datadir ;;
+-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+-  | --da=*)
 +  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-+    datadir=$ac_optarg ;;
-+
+     datadir=$ac_optarg ;;
+ 
 +  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
 +  | --dataroo | --dataro | --datar)
 +    ac_prev=datarootdir ;;
@@ -17603,12 +5455,15 @@
 +  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
 +    datarootdir=$ac_optarg ;;
 +
-+  -disable-* | --disable-*)
-+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # 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; }; }
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+-    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 ;;
 +
@@ -17621,145 +5476,63 @@
 +    ac_prev=dvidir ;;
 +  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
 +    dvidir=$ac_optarg ;;
-+
-+  -enable-* | --enable-*)
-+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
+ 
+   -enable-* | --enable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # 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; }; }
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+-    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- \
-+  | --exec | --exe | --ex)
-+    ac_prev=exec_prefix ;;
-+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-+  | --exec=* | --exe=* | --ex=*)
-+    exec_prefix=$ac_optarg ;;
-+
-+  -gas | --gas | --ga | --g)
-+    # Obsolete; use --with-gas.
-+    with_gas=yes ;;
-+
-+  -help | --help | --hel | --he | -h)
-+    ac_init_help=long ;;
-+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-+    ac_init_help=recursive ;;
-+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-+    ac_init_help=short ;;
-+
-+  -host | --host | --hos | --ho)
-+    ac_prev=host_alias ;;
-+  -host=* | --host=* | --hos=* | --ho=*)
-+    host_alias=$ac_optarg ;;
-+
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -594,6 +1434,12 @@
+   -host=* | --host=* | --hos=* | --ho=*)
+     host_alias=$ac_optarg ;;
+ 
 +  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
 +    ac_prev=htmldir ;;
 +  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
 +  | --ht=*)
 +    htmldir=$ac_optarg ;;
 +
-+  -includedir | --includedir | --includedi | --included | --include \
-+  | --includ | --inclu | --incl | --inc)
-+    ac_prev=includedir ;;
-+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-+  | --includ=* | --inclu=* | --incl=* | --inc=*)
-+    includedir=$ac_optarg ;;
-+
-+  -infodir | --infodir | --infodi | --infod | --info | --inf)
-+    ac_prev=infodir ;;
-+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-+    infodir=$ac_optarg ;;
-+
-+  -libdir | --libdir | --libdi | --libd)
-+    ac_prev=libdir ;;
-+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-+    libdir=$ac_optarg ;;
-+
-+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-+  | --libexe | --libex | --libe)
-+    ac_prev=libexecdir ;;
-+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-+  | --libexe=* | --libex=* | --libe=*)
-+    libexecdir=$ac_optarg ;;
-+
+   -includedir | --includedir | --includedi | --included | --include \
+   | --includ | --inclu | --incl | --inc)
+     ac_prev=includedir ;;
+@@ -618,13 +1464,16 @@
+   | --libexe=* | --libex=* | --libe=*)
+     libexecdir=$ac_optarg ;;
+ 
 +  -localedir | --localedir | --localedi | --localed | --locale)
 +    ac_prev=localedir ;;
 +  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
 +    localedir=$ac_optarg ;;
 +
-+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+   -localstatedir | --localstatedir | --localstatedi | --localstated \
+-  | --localstate | --localstat | --localsta | --localst \
+-  | --locals | --local | --loca | --loc | --lo)
 +  | --localstate | --localstat | --localsta | --localst | --locals)
-+    ac_prev=localstatedir ;;
-+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+     ac_prev=localstatedir ;;
+   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
 +  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-+    localstatedir=$ac_optarg ;;
-+
-+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-+    ac_prev=mandir ;;
-+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-+    mandir=$ac_optarg ;;
-+
-+  -nfp | --nfp | --nf)
-+    # Obsolete; use --without-fp.
-+    with_fp=no ;;
-+
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c | -n)
-+    no_create=yes ;;
-+
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+    no_recursion=yes ;;
-+
-+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-+  | --oldin | --oldi | --old | --ol | --o)
-+    ac_prev=oldincludedir ;;
-+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-+    oldincludedir=$ac_optarg ;;
-+
-+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+    ac_prev=prefix ;;
-+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+    prefix=$ac_optarg ;;
-+
-+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-+  | --program-pre | --program-pr | --program-p)
-+    ac_prev=program_prefix ;;
-+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-+    program_prefix=$ac_optarg ;;
-+
-+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-+  | --program-suf | --program-su | --program-s)
-+    ac_prev=program_suffix ;;
-+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-+    program_suffix=$ac_optarg ;;
-+
-+  -program-transform-name | --program-transform-name \
-+  | --program-transform-nam | --program-transform-na \
-+  | --program-transform-n | --program-transform- \
-+  | --program-transform | --program-transfor \
-+  | --program-transfo | --program-transf \
-+  | --program-trans | --program-tran \
-+  | --progr-tra | --program-tr | --program-t)
-+    ac_prev=program_transform_name ;;
-+  -program-transform-name=* | --program-transform-name=* \
-+  | --program-transform-nam=* | --program-transform-na=* \
-+  | --program-transform-n=* | --program-transform-=* \
-+  | --program-transform=* | --program-transfor=* \
-+  | --program-transfo=* | --program-transf=* \
-+  | --program-trans=* | --program-tran=* \
-+  | --progr-tra=* | --program-tr=* | --program-t=*)
-+    program_transform_name=$ac_optarg ;;
-+
+     localstatedir=$ac_optarg ;;
+ 
+   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+@@ -689,6 +1538,16 @@
+   | --progr-tra=* | --program-tr=* | --program-t=*)
+     program_transform_name=$ac_optarg ;;
+ 
 +  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
 +    ac_prev=pdfdir ;;
 +  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
@@ -17770,161 +5543,92 @@
 +  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
 +    psdir=$ac_optarg ;;
 +
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil)
-+    silent=yes ;;
-+
-+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-+    ac_prev=sbindir ;;
-+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-+  | --sbi=* | --sb=*)
-+    sbindir=$ac_optarg ;;
-+
-+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-+  | --sharedst | --shareds | --shared | --share | --shar \
-+  | --sha | --sh)
-+    ac_prev=sharedstatedir ;;
-+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-+  | --sha=* | --sh=*)
-+    sharedstatedir=$ac_optarg ;;
-+
-+  -site | --site | --sit)
-+    ac_prev=site ;;
-+  -site=* | --site=* | --sit=*)
-+    site=$ac_optarg ;;
-+
-+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-+    ac_prev=srcdir ;;
-+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-+    srcdir=$ac_optarg ;;
-+
-+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-+  | --syscon | --sysco | --sysc | --sys | --sy)
-+    ac_prev=sysconfdir ;;
-+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-+    sysconfdir=$ac_optarg ;;
-+
-+  -target | --target | --targe | --targ | --tar | --ta | --t)
-+    ac_prev=target_alias ;;
-+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-+    target_alias=$ac_optarg ;;
-+
-+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-+    verbose=yes ;;
-+
-+  -version | --version | --versio | --versi | --vers | -V)
-+    ac_init_version=: ;;
-+
-+  -with-* | --with-*)
-+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+@@ -741,24 +1600,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; }; }
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+-    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-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
+ 
+   -without-* | --without-*)
+     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # 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; }; }
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+-    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.
-+    with_x=yes ;;
-+
-+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-+  | --x-incl | --x-inc | --x-in | --x-i)
-+    ac_prev=x_includes ;;
-+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-+    x_includes=$ac_optarg ;;
-+
-+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-+    ac_prev=x_libraries ;;
-+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-+    x_libraries=$ac_optarg ;;
-+
-+  -*) { echo "$as_me: error: unrecognized option: $ac_option
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; }
-+    ;;
-+
-+  *=*)
-+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+   { (exit 1); exit 1; }; }
+ 
+   --x)
+     # Obsolete; use --with-x.
+@@ -789,8 +1644,7 @@
+     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+    { (exit 1); exit 1; }; }
+-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+-    eval "$ac_envvar='$ac_optarg'"
 +    eval $ac_envvar=\$ac_optarg
-+    export $ac_envvar ;;
-+
-+  *)
-+    # FIXME: should be removed in autoconf 3.0.
-+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+    ;;
-+
-+  esac
-+done
-+
-+if test -n "$ac_prev"; then
-+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-+  { echo "$as_me: error: missing argument to $ac_option" >&2
-+   { (exit 1); exit 1; }; }
-+fi
-+
+     export $ac_envvar ;;
+ 
+   *)
+@@ -810,27 +1664,19 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
+-do
+-  eval ac_val=$`echo $ac_var`
+-  case $ac_val in
+-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
+-  esac
+-done
+-
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+-	      localstatedir libdir includedir oldincludedir infodir mandir
 +# 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
+-    [\\/$]* | ?:[\\/]* ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
 +    [\\/$]* | ?:[\\/]* )  continue;;
 +    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-+  esac
+   esac
 +  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
 +   { (exit 1); exit 1; }; }
-+done
-+
-+# There might be people who depend on the old broken behavior: `$host'
-+# used to hold the argument of --host etc.
-+# FIXME: To remove some day.
-+build=$build_alias
-+host=$host_alias
-+target=$target_alias
-+
-+# FIXME: To remove some day.
-+if test "x$host_alias" != x; then
-+  if test "x$build_alias" = x; then
-+    cross_compiling=maybe
-+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    If a cross compiler is detected then cross compile mode will be used." >&2
-+  elif test "x$build_alias" != "x$host_alias"; then
-+    cross_compiling=yes
-+  fi
-+fi
-+
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+test "$silent" = yes && exec 6>/dev/null
-+
-+
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -857,94 +1703,76 @@
+ test "$silent" = yes && exec 6>/dev/null
+ 
+ 
 +ac_pwd=`pwd` && test -n "$ac_pwd" &&
 +ac_ls_di=`ls -di .` &&
 +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -17935,16 +5639,25 @@
 +   { (exit 1); exit 1; }; }
 +
 +
-+# Find the source files, if location was not specified.
-+if test -z "$srcdir"; then
-+  ac_srcdir_defaulted=yes
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+-  # Try the directory containing this script, then its parent.
+-  ac_confdir=`(dirname "$0") 2>/dev/null ||
 +  # Try the directory containing this script, then the parent directory.
 +  ac_confdir=`$as_dirname -- "$0" ||
-+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$0" : 'X\(//\)[^/]' \| \
-+	 X"$0" : 'X\(//\)$' \| \
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$0" : 'X\(//\)[^/]' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
 +	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$0" |
+ echo X"$0" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
@@ -17962,13 +5675,79 @@
 +	    q
 +	  }
 +	  s/.*/./; q'`
-+  srcdir=$ac_confdir
+   srcdir=$ac_confdir
+-  if test ! -r $srcdir/$ac_unique_file; then
 +  if test ! -r "$srcdir/$ac_unique_file"; then
-+    srcdir=..
-+  fi
-+else
-+  ac_srcdir_defaulted=no
-+fi
+     srcdir=..
+   fi
+ else
+   ac_srcdir_defaulted=no
+ fi
+-if test ! -r $srcdir/$ac_unique_file; then
+-  if test "$ac_srcdir_defaulted" = yes; then
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+-   { (exit 1); exit 1; }; }
+-  else
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+-   { (exit 1); exit 1; }; }
+-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+-ac_env_build_alias_set=${build_alias+set}
+-ac_env_build_alias_value=$build_alias
+-ac_cv_env_build_alias_set=${build_alias+set}
+-ac_cv_env_build_alias_value=$build_alias
+-ac_env_host_alias_set=${host_alias+set}
+-ac_env_host_alias_value=$host_alias
+-ac_cv_env_host_alias_set=${host_alias+set}
+-ac_cv_env_host_alias_value=$host_alias
+-ac_env_target_alias_set=${target_alias+set}
+-ac_env_target_alias_value=$target_alias
+-ac_cv_env_target_alias_set=${target_alias+set}
+-ac_cv_env_target_alias_value=$target_alias
+-ac_env_CC_set=${CC+set}
+-ac_env_CC_value=$CC
+-ac_cv_env_CC_set=${CC+set}
+-ac_cv_env_CC_value=$CC
+-ac_env_CFLAGS_set=${CFLAGS+set}
+-ac_env_CFLAGS_value=$CFLAGS
+-ac_cv_env_CFLAGS_set=${CFLAGS+set}
+-ac_cv_env_CFLAGS_value=$CFLAGS
+-ac_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_env_LDFLAGS_value=$LDFLAGS
+-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_env_CPPFLAGS_value=$CPPFLAGS
+-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
+-ac_env_CXX_set=${CXX+set}
+-ac_env_CXX_value=$CXX
+-ac_cv_env_CXX_set=${CXX+set}
+-ac_cv_env_CXX_value=$CXX
+-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_env_CXXFLAGS_value=$CXXFLAGS
+-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+-ac_env_CXXCPP_set=${CXXCPP+set}
+-ac_env_CXXCPP_value=$CXXCPP
+-ac_cv_env_CXXCPP_set=${CXXCPP+set}
+-ac_cv_env_CXXCPP_value=$CXXCPP
+-ac_env_F77_set=${F77+set}
+-ac_env_F77_value=$F77
+-ac_cv_env_F77_set=${F77+set}
+-ac_cv_env_F77_value=$F77
+-ac_env_FFLAGS_set=${FFLAGS+set}
+-ac_env_FFLAGS_value=$FFLAGS
+-ac_cv_env_FFLAGS_set=${FFLAGS+set}
+-ac_cv_env_FFLAGS_value=$FFLAGS
 +if test ! -r "$srcdir/$ac_unique_file"; then
 +  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
 +  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
@@ -17995,57 +5774,32 @@
 +  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
 +  eval ac_cv_env_${ac_var}_value=\$${ac_var}
 +done
-+
-+#
-+# Report the --help message.
-+#
-+if test "$ac_init_help" = "long"; then
-+  # Omit some internal or obsolete options to make the list less imposing.
-+  # This message is too long to be a string in the A/UX 3.1 sh.
-+  cat <<_ACEOF
-+\`configure' configures this package to adapt to many kinds of systems.
-+
-+Usage: $0 [OPTION]... [VAR=VALUE]...
-+
-+To assign environment variables (e.g., CC, CFLAGS...), specify them as
-+VAR=VALUE.  See below for descriptions of some of the useful variables.
-+
-+Defaults for the options are specified in brackets.
-+
-+Configuration:
-+  -h, --help              display this help and exit
-+      --help=short        display options specific to this package
-+      --help=recursive    display the short help of all the included packages
-+  -V, --version           display version information and exit
-+  -q, --quiet, --silent   do not print \`checking...' messages
-+      --cache-file=FILE   cache test results in FILE [disabled]
-+  -C, --config-cache      alias for \`--cache-file=config.cache'
-+  -n, --no-create         do not create output files
-+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-+
-+Installation directories:
-+  --prefix=PREFIX         install architecture-independent files in PREFIX
-+			  [$ac_default_prefix]
-+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-+			  [PREFIX]
-+
-+By default, \`make install' will install all the files in
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-+for instance \`--prefix=\$HOME'.
-+
-+For better control, use the options below.
-+
-+Fine tuning of the installation directories:
-+  --bindir=DIR           user executables [EPREFIX/bin]
-+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-+  --libexecdir=DIR       program executables [EPREFIX/libexec]
-+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-+  --libdir=DIR           object code libraries [EPREFIX/lib]
-+  --includedir=DIR       C header files [PREFIX/include]
-+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+ 
+ #
+ # Report the --help message.
+@@ -973,9 +1801,6 @@
+   -n, --no-create         do not create output files
+       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+ 
+-_ACEOF
+-
+-  cat <<_ACEOF
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+ 			  [$ac_default_prefix]
+@@ -993,15 +1818,22 @@
+   --bindir=DIR           user executables [EPREFIX/bin]
+   --sbindir=DIR          system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR       program executables [EPREFIX/libexec]
+-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+   --libdir=DIR           object code libraries [EPREFIX/lib]
+   --includedir=DIR       C header files [PREFIX/include]
+   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+-  --infodir=DIR          info documentation [PREFIX/info]
+-  --mandir=DIR           man documentation [PREFIX/man]
 +  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
 +  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
 +  --infodir=DIR          info documentation [DATAROOTDIR/info]
@@ -18056,152 +5810,100 @@
 +  --dvidir=DIR           dvi documentation [DOCDIR]
 +  --pdfdir=DIR           pdf documentation [DOCDIR]
 +  --psdir=DIR            ps documentation [DOCDIR]
-+_ACEOF
-+
-+  cat <<\_ACEOF
-+
-+Program names:
-+  --program-prefix=PREFIX            prepend PREFIX to installed program names
-+  --program-suffix=SUFFIX            append SUFFIX to installed program names
-+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-+
-+System types:
-+  --build=BUILD     configure for building on BUILD [guessed]
-+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-+  --target=TARGET   configure for building compilers for TARGET [HOST]
-+_ACEOF
-+fi
-+
-+if test -n "$ac_init_help"; then
-+
-+  cat <<\_ACEOF
-+
-+Optional Features:
-+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+@@ -1025,6 +1857,8 @@
+ Optional Features:
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
 +  --enable-maintainer-mode  enable make rules and dependencies not useful
 +			  (and sometimes confusing) to the casual installer
-+  --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
-+  --enable-strict         compiles with strict compiler options (may not
-+                          work!)
-+  --disable-warnings      disables compilation with -Wall and similar
-+  --enable-profile        creates profiling infos default=no
-+  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors
-+  --enable-pch            enables precompiled header support (currently only
-+                          KCC or gcc >=3.4+unsermake) default=no
-+  --enable-coverage       use gcc coverage testing
-+  --enable-new-ldflags    enable the new linker flags
-+  --enable-final          build size optimized apps (experimental - needs lots
-+                          of memory)
-+  --enable-closure        delay template instantiation
-+  --enable-nmcheck        enable automatic namespace cleanness check
+   --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 +1876,8 @@
+                           of memory)
+   --enable-closure        delay template instantiation
+   --enable-nmcheck        enable automatic namespace cleanness check
+-  --enable-shared[=PKGS]
+-                          build shared libraries [default=yes]
+-  --enable-static[=PKGS]
+-                          build static libraries [default=no]
 +  --enable-shared[=PKGS]  build shared libraries [default=yes]
 +  --enable-static[=PKGS]  build static libraries [default=no]
-+  --enable-libsuffix      /lib directory suffix (64,32,none,auto=default)
-+  --enable-fast-install[=PKGS]
-+                          optimize for fast installation [default=yes]
-+  --disable-libtool-lock  avoid locking (might break parallel builds)
-+  --enable-pie            platform supports PIE linking default=detect
-+  --enable-embedded       link to Qt-embedded, don't use X
-+  --enable-qtopia         link to Qt-embedded, link to the Qtopia Environment
-+  --enable-mac            link to Qt/Mac (don't use X)
-+  --disable-mt            link to non-threaded Qt (deprecated)
-+  --disable-threading     disables threading even if libpthread found
-+  --disable-rpath         do not use the rpath feature of ld
-+  --disable-path-check    don't try to find out, where to install
-+  --enable-gcc-hidden-visibility
-+                          toolchain hidden visibility default=no
-+  --disable-largefile     omit support for large files
-+  --disable-openpty       disable openpty (UNIX98 terminals) support
-+                          default=enabled
-+  --disable-dnssd     don't require libdns_sd (browsing and publishing DNS-SD services will not be possible)
-+
-+Optional Packages:
-+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --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]
+   --enable-libsuffix      /lib directory suffix (64,32,none,auto=default)
+   --enable-fast-install[=PKGS]
+                           optimize for fast installation [default=yes]
+@@ -1071,8 +1903,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]
+-  --with-tags[=TAGS]
+-                          include additional configurations [automatic]
 +  --with-tags[=TAGS]      include additional configurations [automatic]
-+  --with-extra-includes=DIR
-+                          adds non standard include paths
-+  --with-extra-libs=DIR   adds non standard library paths
-+  --with-qt-dir=DIR       where the root of Qt is installed
-+  --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
+   --with-extra-includes=DIR
+                           adds non standard include paths
+   --with-extra-libs=DIR   adds non standard library paths
+@@ -1080,11 +1911,12 @@
+   --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
+-  --with-pam=ARG        enable support for PAM: ARG=yes|no|service, name
 +  --with-pam=ARG          enable support for PAM: ARG=yes|no|service, name
-+  --with-shadow           If you want shadow password support
+   --with-shadow           If you want shadow password support
+-  --with-kdm-pam=val    override PAM service from --with-pam for kdm
+-  --with-kcp-pam=val    override PAM service from --with-pam for kcheckpass
+-  --with-kss-pam=val    override PAM service from --with-pam for kscreensaver
 +  --with-kdm-pam=val      override PAM service from --with-pam for kdm
 +  --with-kcp-pam=val      override PAM service from --with-pam for kcheckpass
 +  --with-kss-pam=val      override PAM service from --with-pam for
 +                          kscreensaver
-+  --with-java=javadir     use java installed in javadir, --without-java
-+                          disables
-+  --without-composite     Disable Xcomposite support (default: check)
-+  --with-ssl-dir=DIR      where the root of OpenSSL is installed
-+  --without-ssl           disable SSL checks
-+  --without-dpms          disable DPMS power saving
-+  --without-gl            disable 3D GL modes
-+  --with-libusb           enable control of some mouse models through libusb
-+                          [default=check]
-+  --with-usbids=PATH      Use the usb.ids file at the specified path, instead
-+                          of the local copy
-+  --with-libraw1394       enable visualization of ieee1394 devices through
-+                          libraw1394 [default=check]
-+  --without-xscreensaver  Disable XScreenSaver support (default: check)
-+  --with-sudo-kdesu-backend
-+                          use sudo as backend for kdesu (default is su)
-+  --without-xdmcp         build kdm without xdmcp support
-+                          default=with, xdmcp
-+  --with-krb4=PATH        Compile in Kerberos v4 support
-+  --with-afs              Compile in AFS support (requires KTH krb4)
-+  --with-krb5auth=PATH    Use Kerberos5 for Xauth cookies in kdm
-+  --with-rpcauth          Use Sun's secure RPC for Xauth cookies in kdm.
-+  --with-kdm-xconsole     build kdm with built-in xconsole default=no
-+  --with-ldap=PATH        Set path for LDAP files default=check
-+  --with-hal              Enable HAL support default=check
-+  --with-samba            enable the samba ioslave [default=check]
-+  --with-openexr          enable support for OpenEXR [default=check]
-+  --without-xinerama      Disable xinerama extension support (default: check)
-+  --with-sensors          enable support for lm_sensors [default=check]
-+
-+Some influential environment variables:
-+  CC          C compiler command
-+  CFLAGS      C compiler flags
-+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-+              nonstandard directory <lib dir>
+   --with-java=javadir     use java installed in javadir, --without-java
+                           disables
+   --without-composite     Disable Xcomposite support (default: check)
+@@ -1120,131 +1952,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
-+  CXX         C++ compiler command
-+  CXXFLAGS    C++ compiler flags
-+  CXXCPP      C++ preprocessor
-+  F77         Fortran 77 compiler command
-+  FFLAGS      Fortran 77 compiler flags
+   CPP         C preprocessor
+   CXX         C++ compiler command
+   CXXFLAGS    C++ compiler flags
+   CXXCPP      C++ preprocessor
+   F77         Fortran 77 compiler command
+   FFLAGS      Fortran 77 compiler flags
 +  XMKMF       Path to xmkmf, Makefile generator for X Window System
-+
-+Use these variables to override the choices made by `configure' or to help
-+it to find libraries and programs with nonstandard names/locations.
-+
-+_ACEOF
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+ 
+ _ACEOF
 +ac_status=$?
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+  # If there are subdirs, report their specific --help.
-+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+ fi
+ 
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+-  ac_popdir=`pwd`
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    test -d $ac_dir || continue
 +    test -d "$ac_dir" || continue
-+    ac_builddir=.
-+
+     ac_builddir=.
+ 
+-if test "$ac_dir" != .; then
 +case "$ac_dir" in
 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +*)
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
 +  # A ".." for each directory in $ac_dir_suffix.
 +  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
 +  case $ac_top_builddir_sub in
@@ -18213,14 +5915,78 @@
 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
 +# for backward compatibility:
 +ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
+ 
+ case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
 +  .)  # We are building in place.
-+    ac_srcdir=.
+     ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
 +    ac_top_srcdir=$ac_top_builddir_sub
 +    ac_abs_top_srcdir=$ac_pwd ;;
 +  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
+-
+-    cd $ac_dir
+-    # Check for guested configure; otherwise get Cygnus style configure.
+-    if test -f $ac_srcdir/configure.gnu; then
+-      echo
+-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+-    elif test -f $ac_srcdir/configure; then
+-      echo
+-      $SHELL $ac_srcdir/configure  --help=recursive
+-    elif test -f $ac_srcdir/configure.ac ||
+-	   test -f $ac_srcdir/configure.in; then
+-      echo
+-      $ac_configure --help
 +    ac_top_srcdir=$srcdir
 +    ac_abs_top_srcdir=$srcdir ;;
 +  *) # Relative name.
@@ -18238,148 +6004,109 @@
 +    elif test -f "$ac_srcdir/configure"; then
 +      echo &&
 +      $SHELL "$ac_srcdir/configure" --help=recursive
-+    else
-+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     else
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+-    fi
+-    cd $ac_popdir
 +    fi || ac_status=$?
 +    cd "$ac_pwd" || { ac_status=$?; break; }
-+  done
-+fi
-+
+   done
+ fi
+ 
+-test -n "$ac_init_help" && exit 0
 +test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+  cat <<\_ACEOF
+ if $ac_init_version; then
+   cat <<\_ACEOF
 +configure
 +generated by GNU Autoconf 2.61
-+
+ 
+-Copyright (C) 2003 Free Software Foundation, Inc.
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+-  exit 0
 +  exit
-+fi
+ fi
+-exec 5>config.log
+-cat >&5 <<_ACEOF
 +cat >config.log <<_ACEOF
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by $as_me, which was
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
 +generated by GNU Autoconf 2.61.  Invocation command line was
-+
-+  $ $0 $@
-+
-+_ACEOF
+ 
+   $ $0 $@
+ 
+ _ACEOF
 +exec 5>>config.log
-+{
-+cat <<_ASUNAME
-+## --------- ##
-+## Platform. ##
-+## --------- ##
-+
-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-+
-+/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`
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+@@ -1263,7 +2065,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`
+-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
 +/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-+/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`
-+
-+_ASUNAME
-+
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  echo "PATH: $as_dir"
-+done
+ /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`
+@@ -1277,6 +2079,7 @@
+   test -z "$as_dir" && as_dir=.
+   echo "PATH: $as_dir"
+ done
 +IFS=$as_save_IFS
-+
-+} >&5
-+
-+cat >&5 <<_ACEOF
-+
-+
-+## ----------- ##
-+## Core tests. ##
-+## ----------- ##
-+
-+_ACEOF
-+
-+
-+# Keep a trace of the command line.
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
-+# Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
-+ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
-+ac_must_keep_next=false
-+for ac_pass in 1 2
-+do
-+  for ac_arg
-+  do
-+    case $ac_arg in
-+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+    | -silent | --silent | --silen | --sile | --sil)
-+      continue ;;
+ 
+ } >&5
+ 
+@@ -1298,7 +2101,6 @@
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+-ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+@@ -1309,7 +2111,7 @@
+     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+     | -silent | --silent | --silen | --sile | --sil)
+       continue ;;
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
 +    *\'*)
-+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    case $ac_pass in
-+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+    2)
-+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+      if test $ac_must_keep_next = true; then
-+	ac_must_keep_next=false # Got value, back to normal.
-+      else
-+	case $ac_arg in
-+	  *=* | --config-cache | -C | -disable-* | --disable-* \
-+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+	  | -with-* | --with-* | -without-* | --without-* | --x)
-+	    case "$ac_configure_args0 " in
-+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+	    esac
-+	    ;;
-+	  -* ) ac_must_keep_next=true ;;
-+	esac
-+      fi
+       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+@@ -1331,9 +2133,7 @@
+ 	  -* ) ac_must_keep_next=true ;;
+ 	esac
+       fi
+-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+-      # Get rid of the leading space.
+-      ac_sep=" "
 +      ac_configure_args="$ac_configure_args '$ac_arg'"
-+      ;;
-+    esac
-+  done
-+done
-+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-+
-+# 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.
+       ;;
+     esac
+   done
+@@ -1344,8 +2144,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.
+-# WARNING: Be sure not to use single quotes in there, as some shells,
+-# such as our DU 5.0 friend, will then `close' the trap.
 +# WARNING: Use '\'' to represent an apostrophe within the trap.
 +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-+trap 'exit_status=$?
-+  # Save into config.log some information that might help in debugging.
-+  {
-+    echo
-+
-+    cat <<\_ASBOX
-+## ---------------- ##
-+## Cache variables. ##
-+## ---------------- ##
-+_ASBOX
-+    echo
-+    # The following way of writing the cache mishandles newlines in values,
+ trap 'exit_status=$?
+   # Save into config.log some information that might help in debugging.
+   {
+@@ -1358,20 +2158,34 @@
+ _ASBOX
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+-{
 +(
 +  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
 +    eval ac_val=\$$ac_var
@@ -18395,110 +6122,109 @@
 +      esac ;;
 +    esac
 +  done
-+  (set) 2>&1 |
+   (set) 2>&1 |
+-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
 +    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
 +    *${as_nl}ac_space=\ *)
-+      sed -n \
+       sed -n \
+-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+-      ;;
 +	"s/'\''/'\''\\\\'\'''\''/g;
 +	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
 +      ;; #(
-+    *)
+     *)
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
 +      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
+       ;;
+-    esac;
+-}
 +    esac |
 +    sort
 +)
-+    echo
-+
-+    cat <<\_ASBOX
-+## ----------------- ##
-+## Output variables. ##
-+## ----------------- ##
-+_ASBOX
-+    echo
-+    for ac_var in $ac_subst_vars
-+    do
+     echo
+ 
+     cat <<\_ASBOX
+@@ -1382,22 +2196,28 @@
+     echo
+     for ac_var in $ac_subst_vars
+     do
+-      eval ac_val=$`echo $ac_var`
+-      echo "$ac_var='"'"'$ac_val'"'"'"
 +      eval ac_val=\$$ac_var
 +      case $ac_val in
 +      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 +      esac
 +      echo "$ac_var='\''$ac_val'\''"
-+    done | sort
-+    echo
-+
-+    if test -n "$ac_subst_files"; then
-+      cat <<\_ASBOX
+     done | sort
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+       cat <<\_ASBOX
+-## ------------- ##
+-## Output files. ##
+-## ------------- ##
 +## ------------------- ##
 +## File substitutions. ##
 +## ------------------- ##
-+_ASBOX
-+      echo
-+      for ac_var in $ac_subst_files
-+      do
+ _ASBOX
+       echo
+       for ac_var in $ac_subst_files
+       do
+-	eval ac_val=$`echo $ac_var`
+-	echo "$ac_var='"'"'$ac_val'"'"'"
 +	eval ac_val=\$$ac_var
 +	case $ac_val in
 +	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 +	esac
 +	echo "$ac_var='\''$ac_val'\''"
-+      done | sort
-+      echo
-+    fi
-+
-+    if test -s confdefs.h; then
-+      cat <<\_ASBOX
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+_ASBOX
-+      echo
+       done | sort
+       echo
+     fi
+@@ -1409,26 +2229,24 @@
+ ## ----------- ##
+ _ASBOX
+       echo
+-      sed "/^$/d" confdefs.h | sort
 +      cat confdefs.h
-+      echo
-+    fi
-+    test "$ac_signal" != 0 &&
-+      echo "$as_me: caught signal $ac_signal"
-+    echo "$as_me: exit $exit_status"
-+  } >&5
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+       echo "$as_me: caught signal $ac_signal"
+     echo "$as_me: exit $exit_status"
+   } >&5
+-  rm -f core *.core &&
+-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
 +  rm -f core *.core core.conftest.* &&
 +    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-+    exit $exit_status
+     exit $exit_status
+-     ' 0
 +' 0
-+for ac_signal in 1 2 13 15; do
-+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-+done
-+ac_signal=0
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+ for ac_signal in 1 2 13 15; do
+   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
+ ac_signal=0
+ 
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -rf conftest* confdefs.h
+-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+-echo >confdefs.h
 +rm -f -r conftest* confdefs.h
-+
-+# Predefined preprocessor variables.
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_NAME "$PACKAGE_NAME"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_VERSION "$PACKAGE_VERSION"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_STRING "$PACKAGE_STRING"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-+_ACEOF
-+
-+
-+# Let the site file select an alternate cache file if it wants to.
-+# Prefer explicitly selected file to automatically selected ones.
+ 
+ # Predefined preprocessor variables.
+ 
+@@ -1459,14 +2277,17 @@
+ 
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+-if test -z "$CONFIG_SITE"; then
+-  if test "x$prefix" != xNONE; then
+-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+-  else
+-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+-  fi
 +if test -n "$CONFIG_SITE"; then
 +  set x "$CONFIG_SITE"
 +elif test "x$prefix" != xNONE; then
@@ -18506,128 +6232,105 @@
 +else
 +  set x "$ac_default_prefix/share/config.site" \
 +	"$ac_default_prefix/etc/config.site"
-+fi
+ fi
+-for ac_site_file in $CONFIG_SITE; do
 +shift
 +for ac_site_file
 +do
-+  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;}
-+    sed 's/^/| /' "$ac_site_file" >&5
-+    . "$ac_site_file"
-+  fi
-+done
-+
-+if test -r "$cache_file"; then
-+  # Some versions of bash will fail to source /dev/null (special
-+  # files actually), so we avoid doing that.
-+  if test -f "$cache_file"; then
-+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+echo "$as_me: loading cache $cache_file" >&6;}
-+    case $cache_file in
+   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;}
+@@ -1482,8 +2303,8 @@
+     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+-      [\\/]* | ?:[\\/]* ) . $cache_file;;
+-      *)                      . ./$cache_file;;
 +      [\\/]* | ?:[\\/]* ) . "$cache_file";;
 +      *)                      . "./$cache_file";;
-+    esac
-+  fi
-+else
-+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+echo "$as_me: creating cache $cache_file" >&6;}
-+  >$cache_file
-+fi
-+
-+# Check that the precious variables saved in the cache have kept the same
-+# value.
-+ac_cache_corrupted=false
+     esac
+   fi
+ else
+@@ -1495,12 +2316,11 @@
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+-for ac_var in `(set) 2>&1 |
+-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
 +for ac_var in $ac_precious_vars; do
-+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-+  eval ac_new_set=\$ac_env_${ac_var}_set
+   eval ac_old_set=\$ac_cv_env_${ac_var}_set
+   eval ac_new_set=\$ac_env_${ac_var}_set
+-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+-  eval ac_new_val="\$ac_env_${ac_var}_value"
 +  eval ac_old_val=\$ac_cv_env_${ac_var}_value
 +  eval ac_new_val=\$ac_env_${ac_var}_value
-+  case $ac_old_set,$ac_new_set in
-+    set,)
-+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+      ac_cache_corrupted=: ;;
-+    ,set)
-+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-+      ac_cache_corrupted=: ;;
-+    ,);;
-+    *)
-+      if test "x$ac_old_val" != "x$ac_new_val"; then
-+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-+echo "$as_me:   former value:  $ac_old_val" >&2;}
-+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-+echo "$as_me:   current value: $ac_new_val" >&2;}
-+	ac_cache_corrupted=:
-+      fi;;
-+  esac
-+  # Pass precious variables to config.status.
-+  if test "$ac_new_set" = set; then
-+    case $ac_new_val in
+   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
+@@ -1525,8 +2345,7 @@
+   # Pass precious variables to config.status.
+   if test "$ac_new_set" = set; then
+     case $ac_new_val in
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
 +    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *) ac_arg=$ac_var=$ac_new_val ;;
-+    esac
-+    case " $ac_configure_args " in
-+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-+    esac
-+  fi
-+done
-+if $ac_cache_corrupted; then
-+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+     *) ac_arg=$ac_var=$ac_new_val ;;
+     esac
+     case " $ac_configure_args " in
+@@ -1543,12 +2362,6 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+ 
+ 
+ 
+@@ -1565,110 +2378,165 @@
+ 
+ 
+ 
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+ac_aux_dir=
+ 
+ 
+ ac_aux_dir=
+-for ac_dir in admin $srcdir/admin; do
+-  if test -f $ac_dir/install-sh; then
 +for ac_dir in admin "$srcdir"/admin; do
 +  if test -f "$ac_dir/install-sh"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install-sh -c"
-+    break
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install-sh -c"
+     break
+-  elif test -f $ac_dir/install.sh; then
 +  elif test -f "$ac_dir/install.sh"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install.sh -c"
-+    break
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install.sh -c"
+     break
+-  elif test -f $ac_dir/shtool; then
 +  elif test -f "$ac_dir/shtool"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/shtool install -c"
-+    break
-+  fi
-+done
-+if test -z "$ac_aux_dir"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/shtool install -c"
+     break
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&2;}
 +  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5
 +echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
+    { (exit 1); exit 1; }; }
+ fi
+-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 +
 +# These three variables are undocumented and unsupported,
 +# and are intended to be withdrawn in a future Autoconf release.
@@ -18637,34 +6340,48 @@
 +ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 +ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 +
-+
-+
-+unset CDPATH
-+
-+# Make sure we can run config.sub.
+ 
+ 
+ unset CDPATH
+ 
+ # Make sure we can run config.sub.
+-$ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
 +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
 +  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-+   { (exit 1); exit 1; }; }
-+
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:$LINENO: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking build system type" >&5
 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-+if test "${ac_cv_build+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_build_alias=$build_alias
+-test -z "$ac_cv_build_alias" &&
+-  ac_cv_build_alias=`$ac_config_guess`
+-test -z "$ac_cv_build_alias" &&
 +  ac_build_alias=$build_alias
 +test "x$ac_build_alias" = x &&
 +  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 +test "x$ac_build_alias" = x &&
-+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-+   { (exit 1); exit 1; }; }
+   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
 +  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+fi
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
 +echo "${ECHO_T}$ac_cv_build" >&6; }
 +case $ac_cv_build in
@@ -18673,7 +6390,10 @@
 +echo "$as_me: error: invalid value of canonical build" >&2;}
 +   { (exit 1); exit 1; }; };;
 +esac
-+build=$ac_cv_build
+ build=$ac_cv_build
+-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 +ac_save_IFS=$IFS; IFS='-'
 +set x $ac_cv_build
 +shift
@@ -18685,23 +6405,33 @@
 +build_os=$*
 +IFS=$ac_save_IFS
 +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-+
-+
+ 
+ 
+-echo "$as_me:$LINENO: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking host system type" >&5
 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-+if test "${ac_cv_host+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_host_alias=$host_alias
+-test -z "$ac_cv_host_alias" &&
+-  ac_cv_host_alias=$ac_cv_build_alias
+-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
 +  if test "x$host_alias" = x; then
 +  ac_cv_host=$ac_cv_build
 +else
 +  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
 +    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-+   { (exit 1); exit 1; }; }
+    { (exit 1); exit 1; }; }
 +fi
-+
-+fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
 +echo "${ECHO_T}$ac_cv_host" >&6; }
 +case $ac_cv_host in
@@ -18710,7 +6440,10 @@
 +echo "$as_me: error: invalid value of canonical host" >&2;}
 +   { (exit 1); exit 1; }; };;
 +esac
-+host=$ac_cv_host
+ host=$ac_cv_host
+-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 +ac_save_IFS=$IFS; IFS='-'
 +set x $ac_cv_host
 +shift
@@ -18722,23 +6455,33 @@
 +host_os=$*
 +IFS=$ac_save_IFS
 +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+
-+
+ 
+ 
+-echo "$as_me:$LINENO: checking target system type" >&5
+-echo $ECHO_N "checking target system type... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking target system type" >&5
 +echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
-+if test "${ac_cv_target+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_target_alias=$target_alias
+-test "x$ac_cv_target_alias" = "x" &&
+-  ac_cv_target_alias=$ac_cv_host_alias
+-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
 +  if test "x$target_alias" = x; then
 +  ac_cv_target=$ac_cv_host
 +else
 +  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
 +    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-+   { (exit 1); exit 1; }; }
+    { (exit 1); exit 1; }; }
 +fi
-+
-+fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+-echo "${ECHO_T}$ac_cv_target" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
 +echo "${ECHO_T}$ac_cv_target" >&6; }
 +case $ac_cv_target in
@@ -18747,7 +6490,10 @@
 +echo "$as_me: error: invalid value of canonical target" >&2;}
 +   { (exit 1); exit 1; }; };;
 +esac
-+target=$ac_cv_target
+ target=$ac_cv_target
+-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 +ac_save_IFS=$IFS; IFS='-'
 +set x $ac_cv_target
 +shift
@@ -18759,446 +6505,305 @@
 +target_os=$*
 +IFS=$ac_save_IFS
 +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-+
-+
-+# The aliases save the names the user supplied, while $host etc.
-+# will get canonicalized.
-+test -n "$target_alias" &&
-+  test "$program_prefix$program_suffix$program_transform_name" = \
-+    NONENONEs,x,x, &&
-+  program_prefix=${target_alias}-
-+test "$program_prefix" != NONE &&
+ 
+ 
+ # The aliases save the names the user supplied, while $host etc.
+@@ -1678,17 +2546,17 @@
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+ test "$program_prefix" != NONE &&
+-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
 +  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-+# Use a double $ so make ignores it.
-+test "$program_suffix" != NONE &&
+ # Use a double $ so make ignores it.
+ test "$program_suffix" != NONE &&
+-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
 +  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-+# Double any \ or $.  echo might interpret backslashes.
-+# By default was `s,x,x', remove it if useless.
-+cat <<\_ACEOF >conftest.sed
-+s/[\\$]/&&/g;s/;s,x,x,$//
-+_ACEOF
-+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+ # Double any \ or $.  echo might interpret backslashes.
+ # By default was `s,x,x', remove it if useless.
+ cat <<\_ACEOF >conftest.sed
+ s/[\\$]/&&/g;s/;s,x,x,$//
+ _ACEOF
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+-rm conftest.sed
 +rm -f conftest.sed
-+
-+
-+am__api_version="1.9"
-+
-+
-+          test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
-+  test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM
-+  test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT
-+  # Find a good install program.  We prefer a C program (faster),
-+# so one script is as good as another.  But avoid the broken or
-+# incompatible versions:
-+# SysV /etc/install, /usr/sbin/install
-+# SunOS /usr/etc/install
-+# IRIX /sbin/install
-+# AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+# OS/2's system install, which has a completely different semantic
-+# ./install, which can be erroneously created by make from ./install.sh.
+ 
+ 
+ am__api_version="1.9"
+@@ -1710,8 +2578,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.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in
-+  ./ | .// | /cC/* | \
-+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-+  /usr/ucb/* ) ;;
-+  *)
-+    # OSF1 and SCO ODT 3.0 have their own names for install.
-+    # Don't use installbsd from OSF since it installs stuff as root
-+    # by default.
-+    for ac_prog in ginstall scoinst install; do
-+      for ac_exec_ext in '' $ac_executable_extensions; do
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1733,7 +2601,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_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+	  if test $ac_prog = install &&
-+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # AIX install.  It has an incompatible calling convention.
-+	    :
-+	  elif test $ac_prog = install &&
-+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # program-specific install script used by HP pwplus--don't use.
-+	    :
-+	  else
-+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	    break 3
-+	  fi
-+	fi
-+      done
-+    done
-+    ;;
-+esac
-+done
+ 	  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.
+@@ -1752,21 +2620,22 @@
+     ;;
+ esac
+ done
 +IFS=$as_save_IFS
-+
-+
-+fi
-+  if test "${ac_cv_path_install+set}" = set; then
-+    INSTALL=$ac_cv_path_install
-+  else
+ 
+ 
+ fi
+   if test "${ac_cv_path_install+set}" = set; then
+     INSTALL=$ac_cv_path_install
+   else
+-    # As a last resort, use the slow shell script.  We don't cache a
+-    # path for INSTALL within a source directory, because that will
 +    # As a last resort, use the slow shell script.  Don't cache a
 +    # value for INSTALL within a source directory, because that will
-+    # break other packages using the cache if that directory is
+     # break other packages using the cache if that directory is
+-    # removed, or if the path is relative.
 +    # removed, or if the value is a relative name.
-+    INSTALL=$ac_install_sh
-+  fi
-+fi
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5
 +echo "${ECHO_T}$INSTALL" >&6; }
-+
-+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-+# It thinks the first close brace ends the variable substitution.
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+
-+  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
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -1780,8 +2649,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
+-    echo "$as_me:$LINENO: checking for -p flag to install" >&5
+-echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for -p flag to install" >&5
 +echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; }
-+    rm -f confinst.$$.* > /dev/null 2>&1
-+    echo "Testtest" > confinst.$$.orig
-+    ac_res=no
-+    if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then
-+      if test -f confinst.$$.new ; then
-+        # OK, -p seems to do no harm to install
-+	INSTALL="${INSTALL} -p"
-+	ac_res=yes
-+      fi
-+    fi
-+    rm -f confinst.$$.*
+     rm -f confinst.$$.* > /dev/null 2>&1
+     echo "Testtest" > confinst.$$.orig
+     ac_res=no
+@@ -1793,8 +2662,8 @@
+       fi
+     fi
+     rm -f confinst.$$.*
+-    echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6
 +    { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+  fi
-+
-+  if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-+    INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)'
-+  fi
-+  if test -z "$kde_save_INSTALL_SCRIPT_given" ; then
-+    INSTALL_SCRIPT='${INSTALL}'
-+  fi
-+
+   fi
+ 
+   if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
+@@ -1804,8 +2673,8 @@
+     INSTALL_SCRIPT='${INSTALL}'
+   fi
+ 
+-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+   if test "$*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$*" != "X $srcdir/configure conftest.file" \
-+      && test "$*" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment" >&5
-+echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment" >&2;}
-+   { (exit 1); exit 1; }; }
-+   fi
-+
-+   test "$2" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-+Check your system clock" >&5
-+echo "$as_me: error: newly created file is older than distributed files!
-+Check your system clock" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+@@ -1847,8 +2716,8 @@
+ Check your system clock" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+fi
-+
-+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # We used to keeping the `.' as first argument, in order to
-+  # allow $(mkdir_p) to be used without argument.  As in
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.  However this is wrong
-+  # for two reasons:
-+  #  1. if the package is installed by a user who cannot write `.'
-+  #     make install will fail,
-+  #  2. the above comment should most certainly read
-+  #     $(mkdir_p) $(DESTDIR)$(somedir)
-+  #     so it does not work when $(somedir) is undefined and
-+  #     $(DESTDIR) is not.
-+  #  To support the latter case, we have to write
-+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+  #  so the `.' trick is pointless.
-+  mkdir_p='mkdir -p --'
-+else
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
-+fi
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ 
+@@ -1899,8 +2768,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_AWK+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -1913,54 +2782,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_AWK="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
+ 
+ fi
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:$LINENO: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6
 +  { echo "$as_me:$LINENO: result: $AWK" >&5
 +echo "${ECHO_T}$AWK" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+  test -n "$AWK" && break
-+done
-+
+   test -n "$AWK" && break
+ done
+ 
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
 +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.make <<\_ACEOF
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.make <<\_ACEOF
 +SHELL = /bin/sh
-+all:
+ all:
+-	@echo 'ac_maketemp="$(MAKE)"'
 +	@echo '@@@%%%=$(MAKE)=@@@%%%'
-+_ACEOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ _ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-if test -n "$ac_maketemp"; then
+-  eval ac_cv_prog_make_${ac_make}_set=yes
+-else
+-  eval ac_cv_prog_make_${ac_make}_set=no
+-fi
 +case `${MAKE-make} -f conftest.make 2>/dev/null` in
 +  *@@@%%%=?*=@@@%%%*)
 +    eval ac_cv_prog_make_${ac_make}_set=yes;;
 +  *)
 +    eval ac_cv_prog_make_${ac_make}_set=no;;
 +esac
-+rm -f conftest.make
-+fi
+ rm -f conftest.make
+ fi
+-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+  SET_MAKE=
-+else
+   SET_MAKE=
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+  SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-+  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+
-+
-+# Define the identity of the package.
-+ PACKAGE=kdebase-3.5.6.dfsg.1
-+ VERSION="3.5.5"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE "$PACKAGE"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define VERSION "$VERSION"
-+_ACEOF
-+
-+# Some tools Automake needs.
-+
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-+
-+
-+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-+
-+
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+
-+
-+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-+
-+
-+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-+
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+if test "$cross_compiling" != no; then
-+  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
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+@@ -1992,7 +2864,7 @@
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE=kdebase
++ PACKAGE=kdebase.dfsg.1
+  VERSION="3.5.6"
+ 
+ 
+@@ -2031,8 +2903,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2045,32 +2917,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
+ 
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
 +  { echo "$as_me:$LINENO: result: $STRIP" >&5
 +echo "${ECHO_T}$STRIP" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2083,27 +2957,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_ac_ct_STRIP="strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
+ 
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
 +  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
 +echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
+ fi
+ 
+-  STRIP=$ac_ct_STRIP
 +  if test "x$ac_ct_STRIP" = x; then
 +    STRIP=":"
 +  else
@@ -19214,25 +6819,13 @@
 +esac
 +    STRIP=$ac_ct_STRIP
 +  fi
-+else
-+  STRIP="$ac_cv_prog_STRIP"
-+fi
-+
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-+
-+
-+
+ else
+   STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -2123,6 +3011,31 @@
+ 
+ 
+ 
 +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
 +    # Check whether --enable-maintainer-mode was given.
@@ -19258,452 +6851,342 @@
 +
 +
 +
-+
-+  unset CDPATH
-+
-+
-+
-+    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-+    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-+    if test -n "$KDEDIRS"; then
-+       kde_save_IFS=$IFS
-+       IFS=:
-+       for dir in $KDEDIRS; do
-+            kde_default_bindirs="$dir/bin $kde_default_bindirs "
-+       done
-+       IFS=$kde_save_IFS
-+    fi
-+
-+  if test "x$prefix" = "xNONE"; then
-+
+ 
+   unset CDPATH
+ 
+@@ -2141,14 +3054,14 @@
+ 
+   if test "x$prefix" = "xNONE"; then
+ 
+-   echo "$as_me:$LINENO: checking for kde-config" >&5
+-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for kde-config" >&5
 +echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
-+   if test -n "$KDECONFIG"; then
-+        kde_cv_path="$KDECONFIG";
-+   else
-+        kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
-+
+    if test -n "$KDECONFIG"; then
+         kde_cv_path="$KDECONFIG";
+    else
+         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z "prepend"; then  	  dirs="$kde_default_bindirs $dirs"
-+        else  	  dirs="$dirs $kde_default_bindirs"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/kde-config"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/kde-config  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/kde-config"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/kde-config"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -2191,8 +3104,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+    { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
-+Please check whether you installed KDE correctly.
-+" >&5
-+echo "$as_me: error: The important program kde-config was not found!
-+Please check whether you installed KDE correctly.
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+   else
+ 
+     { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+ Please check whether you installed KDE correctly.
+@@ -2203,8 +3116,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      KDECONFIG=$kde_cv_path
-+
-+   fi
-+
-+  else
-+        kde_save_PATH="$PATH"
-+    PATH="$exec_prefix/bin:$prefix/bin:$PATH"
-+
+       KDECONFIG=$kde_cv_path
+ 
+    fi
+@@ -2213,14 +3126,14 @@
+         kde_save_PATH="$PATH"
+     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
+ 
+-   echo "$as_me:$LINENO: checking for kde-config" >&5
+-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for kde-config" >&5
 +echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
-+   if test -n "$KDECONFIG"; then
-+        kde_cv_path="$KDECONFIG";
-+   else
-+        kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
-+
+    if test -n "$KDECONFIG"; then
+         kde_cv_path="$KDECONFIG";
+    else
+         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z "prepend"; then  	  dirs="$kde_default_bindirs $dirs"
-+        else  	  dirs="$dirs $kde_default_bindirs"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/kde-config"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/kde-config  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/kde-config"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/kde-config"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -2263,8 +3176,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+    { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
-+Please check whether you installed KDE correctly.
-+" >&5
-+echo "$as_me: error: The important program kde-config was not found!
-+Please check whether you installed KDE correctly.
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+   else
+ 
+     { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+ Please check whether you installed KDE correctly.
+@@ -2275,8 +3188,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      KDECONFIG=$kde_cv_path
-+
-+   fi
-+
-+    PATH="$kde_save_PATH"
-+  fi
-+
-+  kde_libs_prefix=`$KDECONFIG --prefix`
-+  if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-+       { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
-+                    This means it has been moved since you installed it.
-+                    This won't work. Please recompile kdelibs for the new prefix.
-+                    " >&5
-+echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
-+                    This means it has been moved since you installed it.
-+                    This won't work. Please recompile kdelibs for the new prefix.
-+                    " >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+  kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-+
+       KDECONFIG=$kde_cv_path
+ 
+    fi
+@@ -2298,16 +3211,16 @@
+   fi
+   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+ 
+-  echo "$as_me:$LINENO: checking where to install" >&5
+-echo $ECHO_N "checking where to install... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking where to install" >&5
 +echo $ECHO_N "checking where to install... $ECHO_C" >&6; }
-+  if test "x$prefix" = "xNONE"; then
-+    prefix=$kde_libs_prefix
+   if test "x$prefix" = "xNONE"; then
+     prefix=$kde_libs_prefix
+-    echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
+-echo "${ECHO_T}$prefix (as returned by kde-config)" >&6
 +    { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
 +echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; }
-+  else
-+        given_prefix=$prefix
+   else
+         given_prefix=$prefix
+-    echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
+-echo "${ECHO_T}$prefix (as requested)" >&6
 +    { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
 +echo "${ECHO_T}$prefix (as requested)" >&6; }
-+  fi
-+
-+  # And delete superfluous '/' to make compares easier
-+  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+  given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+
-+
-+
-+
-+
-+
+   fi
+ 
+   # And delete superfluous '/' to make compares easier
+@@ -2320,13 +3233,13 @@
+ 
+ 
+ 
+-    # Check whether --enable-fast-perl or --disable-fast-perl was given.
 +    # Check whether --enable-fast-perl was given.
-+if test "${enable_fast_perl+set}" = set; then
+ if test "${enable_fast_perl+set}" = set; then
+-  enableval="$enable_fast_perl"
+-  with_fast_perl=$enableval
 +  enableval=$enable_fast_perl; with_fast_perl=$enableval
-+else
-+  with_fast_perl=yes
+ else
+   with_fast_perl=yes
+-fi;
 +fi
 +
-+
-+
-+  val=
-+  if test -f $srcdir/configure.files ; then
-+    val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files`
-+  fi
-+  CONF_FILES=
-+  if test -n "$val" ; then
-+    for i in $val ; do
-+      CONF_FILES="$CONF_FILES $i"
-+    done
-+  fi
-+
-+
-+
-+
+ 
+ 
+   val=
+@@ -2343,11 +3256,11 @@
+ 
+ 
+ 
+-          ac_config_headers="$ac_config_headers config.h"
 +ac_config_headers="$ac_config_headers config.h"
-+
-+DEPDIR="${am__leading_dot}deps"
-+
+ 
+ DEPDIR="${am__leading_dot}deps"
+ 
+-          ac_config_commands="$ac_config_commands depfiles"
 +ac_config_commands="$ac_config_commands depfiles"
-+
-+
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
+ 
+ 
+ am_make=${MAKE-make}
+@@ -2357,8 +3270,8 @@
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+
-+
+ am__include="#"
+ am__quote=
+ _am_result=none
+@@ -2385,15 +3298,15 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $_am_result" >&5
+-echo "${ECHO_T}$_am_result" >&6
 +{ echo "$as_me:$LINENO: result: $_am_result" >&5
 +echo "${ECHO_T}$_am_result" >&6; }
-+rm -f confinc confmf
-+
+ rm -f confinc confmf
+ 
+-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
 +# Check whether --enable-dependency-tracking was given.
-+if test "${enable_dependency_tracking+set}" = set; then
+ if test "${enable_dependency_tracking+set}" = set; then
+-  enableval="$enable_dependency_tracking"
 +  enableval=$enable_dependency_tracking;
 +fi
-+
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+
-+
-+if test "x$enable_dependency_tracking" != xno; then
-+  AMDEP_TRUE=
-+  AMDEP_FALSE='#'
-+else
-+  AMDEP_TRUE='#'
-+  AMDEP_FALSE=
-+fi
-+
-+
-+
-+
-+
-+
+ 
+-fi;
+ if test "x$enable_dependency_tracking" != xno; then
+   am_depcomp="$ac_aux_dir/depcomp"
+   AMDEPBACKSLASH='\'
+@@ -2413,10 +3326,9 @@
+ 
+ 
+ 
+-  # Check whether --enable-debug or --disable-debug was given.
 +  # Check whether --enable-debug was given.
-+if test "${enable_debug+set}" = set; then
+ if test "${enable_debug+set}" = set; then
+-  enableval="$enable_debug"
+-
 +  enableval=$enable_debug;
-+    case $enableval in
-+      yes)
-+        kde_use_debug_code="yes"
-+        kde_use_debug_define=no
-+        ;;
-+      full)
-+        kde_use_debug_code="full"
-+        kde_use_debug_define=no
-+        ;;
-+      *)
-+        kde_use_debug_code="no"
-+        kde_use_debug_define=yes
-+        ;;
-+    esac
-+
-+else
-+  kde_use_debug_code="no"
-+      kde_use_debug_define=no
-+
+     case $enableval in
+       yes)
+         kde_use_debug_code="yes"
+@@ -2436,18 +3348,18 @@
+   kde_use_debug_code="no"
+       kde_use_debug_define=no
+ 
+-fi;
 +fi
 +
-+
+ 
+-    # Check whether --enable-dummyoption or --disable-dummyoption was given.
 +    # Check whether --enable-dummyoption was given.
-+if test "${enable_dummyoption+set}" = set; then
+ if test "${enable_dummyoption+set}" = set; then
+-  enableval="$enable_dummyoption"
 +  enableval=$enable_dummyoption;
 +fi
-+
-+
+ 
+-fi;
+ 
+-  # Check whether --enable-strict or --disable-strict was given.
 +  # Check whether --enable-strict was given.
-+if test "${enable_strict+set}" = set; then
+ if test "${enable_strict+set}" = set; then
+-  enableval="$enable_strict"
+-
 +  enableval=$enable_strict;
-+    if test $enableval = "no"; then
-+         kde_use_strict_options="no"
-+       else
-+         kde_use_strict_options="yes"
-+    fi
-+
-+else
-+  kde_use_strict_options="no"
+     if test $enableval = "no"; then
+          kde_use_strict_options="no"
+        else
+@@ -2456,12 +3368,12 @@
+ 
+ else
+   kde_use_strict_options="no"
+-fi;
 +fi
-+
-+
+ 
+-  # Check whether --enable-warnings or --disable-warnings was given.
+-if test "${enable_warnings+set}" = set; then
+-  enableval="$enable_warnings"
+ 
 +  # Check whether --enable-warnings was given.
 +if test "${enable_warnings+set}" = set; then
 +  enableval=$enable_warnings;
-+    if test $enableval = "no"; then
-+         kde_use_warnings="no"
-+       else
-+         kde_use_warnings="yes"
-+    fi
-+
-+else
-+  kde_use_warnings="yes"
+     if test $enableval = "no"; then
+          kde_use_warnings="no"
+        else
+@@ -2470,20 +3382,21 @@
+ 
+ else
+   kde_use_warnings="yes"
+-fi;
 +fi
 +
-+
-+    if test "$kde_use_debug_code" != "no"; then
-+    kde_use_warnings=yes
-+  fi
-+
+ 
+     if test "$kde_use_debug_code" != "no"; then
+     kde_use_warnings=yes
+   fi
+ 
+-  # Check whether --enable-profile or --disable-profile was given.
 +  # Check whether --enable-profile was given.
-+if test "${enable_profile+set}" = set; then
+ if test "${enable_profile+set}" = set; then
+-  enableval="$enable_profile"
+-  kde_use_profiling=$enableval
 +  enableval=$enable_profile; kde_use_profiling=$enableval
-+else
-+  kde_use_profiling="no"
-+
+ else
+   kde_use_profiling="no"
+ 
+-fi;
 +fi
 +
-+
-+    CFLAGS=" $CFLAGS"
-+
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+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
+ 
+     CFLAGS=" $CFLAGS"
+ 
+@@ -2495,8 +3408,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2509,32 +3422,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
 +  { echo "$as_me:$LINENO: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+  ac_ct_CC=$CC
-+  # Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
+ fi
+ if test -z "$ac_cv_prog_CC"; then
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2547,36 +3462,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_ac_ct_CC="gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
 +  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 +echo "${ECHO_T}$ac_ct_CC" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
+ fi
+ 
+-  CC=$ac_ct_CC
 +  if test "x$ac_ct_CC" = x; then
 +    CC=""
 +  else
@@ -19719,195 +7202,236 @@
 +esac
 +    CC=$ac_ct_CC
 +  fi
-+else
-+  CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
+ else
+   CC="$ac_cv_prog_CC"
+ fi
+ 
+ if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 +          if test -n "$ac_tool_prefix"; then
 +    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2589,74 +3519,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
 +  { echo "$as_me:$LINENO: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
+ fi
+ 
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+ 
 +  fi
-+fi
-+if test -z "$CC"; then
-+  # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
+ fi
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2670,7 +3560,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+       ac_prog_rejected=yes
-+       continue
-+     fi
-+    ac_cv_prog_CC="cc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -2681,6 +3571,7 @@
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+if test $ac_prog_rejected = yes; then
-+  # We found a bogon in the path, so make sure we never use it.
-+  set dummy $ac_cv_prog_CC
-+  shift
-+  if test $# != 0; then
-+    # We chose a different compiler from the bogus one.
-+    # However, it has the same basename, so the bogon will be chosen
-+    # first if we set CC to just the basename; use the full file name.
-+    shift
-+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+  fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
+ 
+ if test $ac_prog_rejected = yes; then
+   # We found a bogon in the path, so make sure we never use it.
+@@ -2698,22 +3589,23 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
 +  { echo "$as_me:$LINENO: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+fi
-+if test -z "$CC"; then
-+  if test -n "$ac_tool_prefix"; then
+ fi
+ if test -z "$CC"; then
+   if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl
 +  for ac_prog in cl.exe
-+  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
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2726,36 +3618,38 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
 +  { echo "$as_me:$LINENO: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+    test -n "$CC" && break
-+  done
-+fi
-+if test -z "$CC"; then
-+  ac_ct_CC=$CC
+     test -n "$CC" && break
+   done
+ fi
+ if test -z "$CC"; then
+   ac_ct_CC=$CC
+-  for ac_prog in cl
 +  for ac_prog in cl.exe
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2768,29 +3662,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
 +  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 +echo "${ECHO_T}$ac_ct_CC" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+  test -n "$ac_ct_CC" && break
-+done
-+
+   test -n "$ac_ct_CC" && break
+ done
+ 
+-  CC=$ac_ct_CC
 +  if test "x$ac_ct_CC" = x; then
 +    CC=""
 +  else
@@ -19923,20 +7447,19 @@
 +esac
 +    CC=$ac_ct_CC
 +  fi
-+fi
-+
-+fi
-+
-+
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+# Provide some information about the compiler.
+ fi
+ 
+ fi
+@@ -2803,21 +3713,35 @@
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+-     "checking for C compiler version" >&5
 +echo "$as_me:$LINENO: checking for C compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
 +{ (ac_try="$ac_compiler --version >&5"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -19944,9 +7467,11 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compiler --version >&5") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
 +{ (ac_try="$ac_compiler -v >&5"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -19954,9 +7479,11 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compiler -v >&5") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
 +{ (ac_try="$ac_compiler -V >&5"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -19964,33 +7491,20 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compiler -V >&5") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+
-+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
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+# Try to create an executable without -o first, disregard a.out.
-+# It will help us diagnose broken compilers, and finding out an intuition
-+# of exeext.
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+@@ -2842,47 +3766,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.
+-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+-  (eval $ac_link_default) 2>&5
 +#
 +# List of possible output files, starting from the most likely.
 +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
@@ -20017,25 +7531,43 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link_default") 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
+-  # Find the output, starting from the most likely.  This scheme is
+-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+-# resort.
+-
+-# Be careful to initialize this variable, since it used to be cached.
+-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+-ac_cv_exeext=
+-# b.out is created by i960 compilers.
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
 +  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 +# in a Makefile.  We should not override ac_cv_exeext if it was cached,
 +# so that the user can short-circuit this test for compilers unknown to
 +# Autoconf.
 +for ac_file in $ac_files ''
-+do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
+ do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+-	;;
+-    conftest.$ac_ext )
+-	# This is the source file.
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-+	;;
-+    [ab].out )
-+	# We found the default executable, but exeext='' is most
-+	# certainly right.
-+	break;;
-+    *.* )
+ 	;;
+     [ab].out )
+ 	# We found the default executable, but exeext='' is most
+ 	# certainly right.
+ 	break;;
+     *.* )
+-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	# FIXME: I believe we export ac_cv_exeext for Libtool,
+-	# but it would be cool to find out if it's true.  Does anybody
+-	# maintain Libtool? --akim.
+-	export ac_cv_exeext
 +        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 +	then :; else
 +	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
@@ -20045,71 +7577,75 @@
 +	# argument, so we may need to know it at that point already.
 +	# Even if this section looks crufty: it has the advantage of
 +	# actually working.
-+	break;;
-+    * )
-+	break;;
-+  esac
-+done
+ 	break;;
+     * )
+ 	break;;
+   esac
+ done
 +test "$ac_cv_exeext" = no && ac_cv_exeext=
 +
-+else
+ else
 +  ac_file=''
 +fi
 +
 +{ echo "$as_me:$LINENO: result: $ac_file" >&5
 +echo "${ECHO_T}$ac_file" >&6; }
 +if test -z "$ac_file"; then
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C compiler cannot create executables
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+fi
-+
-+ac_exeext=$ac_cv_exeext
-+
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+@@ -2894,19 +3848,21 @@
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6
+ 
+-# Check the compiler produces executables we can run.  If not, either
 +# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-+# If not cross compiling, check that we can run a simple program.
-+if test "$cross_compiling" != yes; then
-+  if { ac_try='./$ac_file'
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+  fi
-+fi
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -2925,22 +3881,27 @@
+     fi
+   fi
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+ac_clean_files=$ac_clean_files_save
+ 
+ rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check the compiler produces executables we can run.  If not, either
 +# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6
+-
+-echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
 +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
@@ -20124,58 +7660,45 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-+# work properly (i.e., refer to `conftest.exe'), while it won't with
-+# `rm'.
-+for ac_file in conftest.exe conftest conftest.*; do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+@@ -2951,9 +3912,8 @@
+ for ac_file in conftest.exe conftest conftest.*; do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	  break;;
-+    * ) break;;
-+  esac
-+done
-+else
-+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest$ac_cv_exeext
+     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	  export ac_cv_exeext
+ 	  break;;
+     * ) break;;
+   esac
+@@ -2967,14 +3927,14 @@
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 +echo "${ECHO_T}$ac_cv_exeext" >&6; }
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-+if test "${ac_cv_objext+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.o conftest.obj
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2994,14 +3954,20 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -20183,58 +7706,41 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 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
+-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
 +  for ac_file in conftest.o conftest.obj conftest.*; do
 +  test -f "$ac_file" || continue;
-+  case $ac_file in
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+       break;;
-+  esac
-+done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest.$ac_cv_objext conftest.$ac_ext
-+fi
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+@@ -3019,12 +3985,12 @@
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 +echo "${ECHO_T}$ac_cv_objext" >&6; }
-+OBJEXT=$ac_cv_objext
-+ac_objext=$OBJEXT
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3047,50 +4013,49 @@
+ }
+ _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;;
@@ -20242,57 +7748,73 @@
 +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
+   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
 +  (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
-+
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
 +	ac_compiler_gnu=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-+GCC=`test $ac_compiler_gnu = yes && echo yes`
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
 +  ac_save_c_werror_flag=$ac_c_werror_flag
 +   ac_c_werror_flag=yes
 +   ac_cv_prog_cc_g=no
 +   CFLAGS="-g"
 +   cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3106,38 +4071,118 @@
+ }
+ _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;;
@@ -20300,11 +7822,16 @@
 +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
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
@@ -20338,11 +7865,15 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
@@ -20377,118 +7908,98 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $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_prog_cc_g=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   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
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 +{ 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
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -3153,12 +4198,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 "$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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_prog_cc_stdc=no
 +  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
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3192,12 +4237,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
 +   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
+    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.  */
 +   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
+ 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 ()
-+{
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ int test (int i, double x);
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -3212,205 +4262,57 @@
+   return 0;
+ }
+ _ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX			-qlanglvl=ansi
+-# Ultrix and OSF/1	-std1
+-# HP-UX 10.20 and later	-Ae
+-# 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__"
 +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
+ 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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -20496,30 +8007,53 @@
 +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
+   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
+-  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
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext
 +  test "x$ac_cv_prog_cc_c89" != "xno" && break
-+done
+ done
+-rm -f conftest.$ac_ext conftest.$ac_objext
 +rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
-+fi
+ CC=$ac_save_CC
+ 
+ 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)
@@ -20528,169 +8062,200 @@
 +  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" ;;
 +    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
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+depcc="$CC"   am_compiler_list=
-+
+ 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
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+-  choke me
+-#endif
+-_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
+-  for ac_declaration in \
+-   '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_declaration
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  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
+-  :
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_declaration
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  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
+-  break
+-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
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
+-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
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -3419,8 +4321,8 @@
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3509,8 +4411,8 @@
+ fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
-+
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+ 
+@@ -3532,8 +4434,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
+-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+  if test "${ac_cv_prog_CPP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+      # Double quotes because CPP needs to be expanded
-+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -3567,24 +4469,22 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -20698,36 +8263,47 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3593,9 +4493,10 @@
+   # Broken: fails on valid input.
+ continue
+ fi
 +
-+  # Broken: fails on valid input.
-+continue
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
 +  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3605,24 +4506,22 @@
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -20735,67 +8311,54 @@
 +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
+   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; 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
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -3633,6 +4532,7 @@
+ ac_preproc_ok=:
+ break
+ fi
 +
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+  break
-+fi
-+
-+    done
-+    ac_cv_prog_CPP=$CPP
-+
-+fi
-+  CPP=$ac_cv_prog_CPP
-+else
-+  ac_cv_prog_CPP=$CPP
-+fi
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -3650,8 +4550,8 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
 +{ echo "$as_me:$LINENO: result: $CPP" >&5
 +echo "${ECHO_T}$CPP" >&6; }
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -3674,24 +4574,22 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -20803,36 +8366,47 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3700,9 +4598,10 @@
+   # Broken: fails on valid input.
+ continue
+ fi
 +
-+  # Broken: fails on valid input.
-+continue
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
 +  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3712,24 +4611,22 @@
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -20840,172 +8414,147 @@
 +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
+   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; 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
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -3740,6 +4637,7 @@
+ ac_preproc_ok=:
+ break
+ fi
 +
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+  :
-+else
-+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+  if test "$GCC" = "yes"; then
-+    if test "$kde_use_debug_code" != "no"; then
-+      if test $kde_use_debug_code = "full"; then
-+        CFLAGS="-g3 -fno-inline $CFLAGS"
-+      else
-+        CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS"
-+      fi
-+    else
-+      CFLAGS="-O2 $CFLAGS"
-+    fi
-+  fi
-+
-+  if test "$kde_use_debug_define" = "yes"; then
-+    CFLAGS="-DNDEBUG $CFLAGS"
-+  fi
-+
-+
-+  case "$host" in
-+  *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
-+  *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
-+  esac
-+
-+  if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then
-+     LDFLAGS=""
-+  fi
-+
-+  CXXFLAGS=" $CXXFLAGS"
-+
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -3790,18 +4688,22 @@
+ 
+   CXXFLAGS=" $CXXFLAGS"
+ 
+-  ac_ext=cc
 +  ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 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
+-if test -n "$ac_tool_prefix"; then
+-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
 +if test -z "$CXX"; then
 +  if test -n "$CCC"; then
 +    CXX=$CCC
 +  else
 +    if test -n "$ac_tool_prefix"; then
 +  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+  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
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CXX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$CXX"; then
-+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3814,36 +4716,38 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+CXX=$ac_cv_prog_CXX
-+if test -n "$CXX"; then
+ 
+ fi
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:$LINENO: result: $CXX" >&5
+-echo "${ECHO_T}$CXX" >&6
 +  { echo "$as_me:$LINENO: result: $CXX" >&5
 +echo "${ECHO_T}$CXX" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+    test -n "$CXX" && break
-+  done
-+fi
-+if test -z "$CXX"; then
-+  ac_ct_CXX=$CXX
+     test -n "$CXX" && break
+   done
+ fi
+ if test -z "$CXX"; then
+   ac_ct_CXX=$CXX
+-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
 +  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_CXX"; then
-+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3856,55 +4760,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_ac_ct_CXX="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-+if test -n "$ac_ct_CXX"; then
+ 
+ fi
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+-echo "${ECHO_T}$ac_ct_CXX" >&6
 +  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 +echo "${ECHO_T}$ac_ct_CXX" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+  test -n "$ac_ct_CXX" && break
-+done
-+
+   test -n "$ac_ct_CXX" && break
+ done
+-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+ 
+-  CXX=$ac_ct_CXX
 +  if test "x$ac_ct_CXX" = x; then
 +    CXX="g++"
 +  else
@@ -21021,13 +8570,18 @@
 +esac
 +    CXX=$ac_ct_CXX
 +  fi
-+fi
-+
+ fi
+ 
+-
 +  fi
 +fi
-+# Provide some information about the compiler.
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+-     "checking for C++ compiler version" >&5
 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
 +{ (ac_try="$ac_compiler --version >&5"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -21035,9 +8589,11 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compiler --version >&5") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
 +{ (ac_try="$ac_compiler -v >&5"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -21045,9 +8601,11 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compiler -v >&5") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
 +{ (ac_try="$ac_compiler -V >&5"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -21055,34 +8613,23 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compiler -V >&5") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
-+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3927,50 +4861,49 @@
+ }
+ _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;;
@@ -21090,57 +8637,73 @@
 +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
+   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_cxx_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_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
-+
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
 +	ac_compiler_gnu=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-+
-+fi
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-+GXX=`test $ac_compiler_gnu = yes && echo yes`
-+ac_test_CXXFLAGS=${CXXFLAGS+set}
-+ac_save_CXXFLAGS=$CXXFLAGS
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+-CXXFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cxx_g+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
 +  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
 +   ac_cxx_werror_flag=yes
 +   ac_cv_prog_cxx_g=no
 +   CXXFLAGS="-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
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3986,159 +4919,133 @@
+ }
+ _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;;
@@ -21148,37 +8711,86 @@
 +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
+   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_cxx_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_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
-+
+   ac_cv_prog_cxx_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_cxx_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+-if test "$ac_test_CXXFLAGS" = set; then
+-  CXXFLAGS=$ac_save_CXXFLAGS
+-elif test $ac_cv_prog_cxx_g = yes; then
+-  if test "$GXX" = yes; then
+-    CXXFLAGS="-g -O2"
+-  else
+-    CXXFLAGS="-g"
+-  fi
+-else
+-  if test "$GXX" = yes; then
+-    CXXFLAGS="-O2"
+-  else
+-    CXXFLAGS=
+-  fi
+-fi
+-for ac_declaration in \
+-   '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
 +	CXXFLAGS=""
 +      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;;
@@ -21186,38 +8798,60 @@
 +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
+   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_cxx_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_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
-+
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
 +	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 +	 CXXFLAGS="-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
 +
-+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;;
@@ -21225,26 +8859,48 @@
 +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
+   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_cxx_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
+-  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
-+sed 's/^/| /' conftest.$ac_ext >&5
+ 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
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
+ fi
+ 
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +
@@ -21268,149 +8924,48 @@
 +    CXXFLAGS=
 +  fi
 +fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+depcc="$CXX"  am_compiler_list=
-+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4147,8 +5054,8 @@
+ 
+ depcc="$CXX"  am_compiler_list=
+ 
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
-+fi
-+
-+fi
+ if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -4237,8 +5144,8 @@
+ fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
-+else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
-+fi
-+
-+
-+
-+
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+ 
+ 
+@@ -4256,8 +5163,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
+-echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
 +echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; }
-+
-+
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#ifdef __GNUC__
-+#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
-+choke me
-+#endif
-+#endif
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 
+ 
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -4282,39 +5189,35 @@
+ }
+ _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;;
@@ -21418,106 +8973,77 @@
 +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
+   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
 +  (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
-+
+   kde_bad_compiler=no
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_bad_compiler=yes
 +	kde_bad_compiler=yes
-+
-+fi
-+
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-  echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+-echo "${ECHO_T}$kde_bad_compiler" >&6
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +  { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
 +echo "${ECHO_T}$kde_bad_compiler" >&6; }
-+
-+if test "$kde_bad_compiler" = "yes"; then
-+  { { echo "$as_me:$LINENO: error:
-+
-+This particular compiler version is blacklisted because it
-+is known to miscompile KDE. Please use a newer version, or
-+if that is not yet available, choose an older version.
-+
-+Please do not report a bug or bother us reporting this
-+configure error. We know about it, and we introduced
-+it by intention to avoid untraceable bugs or crashes in KDE.
-+
-+" >&5
-+echo "$as_me: error:
-+
-+This particular compiler version is blacklisted because it
-+is known to miscompile KDE. Please use a newer version, or
-+if that is not yet available, choose an older version.
-+
-+Please do not report a bug or bother us reporting this
-+configure error. We know about it, and we introduced
-+it by intention to avoid untraceable bugs or crashes in KDE.
-+
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+
-+  if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-+    if test "$kde_use_debug_code" != "no"; then
-+      if test "$CXX" = "KCC"; then
-+        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-+      else
-+        if test "$kde_use_debug_code" = "full"; then
-+          CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
-+        else
-+          CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS"
-+        fi
-+      fi
-+
+ 
+ if test "$kde_bad_compiler" = "yes"; then
+   { { echo "$as_me:$LINENO: error:
+@@ -4356,17 +5259,16 @@
+         fi
+       fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
 +echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; }
-+kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+ 
+-
+-ac_ext=cc
 +ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -fno-builtin"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -4394,34 +5296,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -21525,85 +9051,87 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4434,29 +5334,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="-fno-builtin $CXXFLAGS"
-+else
+  :
+  CXXFLAGS="-fno-builtin $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
-+
+  :
+ 
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
+-echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
 +echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; }
-+kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -Woverloaded-virtual"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -4483,34 +5382,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -21611,99 +9139,88 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4523,13 +5420,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
-+else
+  :
+  WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+ WOVERLOADED_VRITUAL=""
-+fi
-+
-+
-+    else
-+      if test "$CXX" = "KCC"; then
-+        CXXFLAGS="+K3 $CXXFLAGS"
-+      else
-+        CXXFLAGS="-O2 $CXXFLAGS"
-+      fi
-+    fi
-+  fi
-+
-+  if test "$kde_use_debug_define" = "yes"; then
-+    CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
-+  fi
-+
-+  if test "$kde_use_profiling" = "yes"; then
-+
+  :
+  WOVERLOADED_VRITUAL=""
+ fi
+@@ -4550,16 +5447,15 @@
+ 
+   if test "$kde_use_profiling" = "yes"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
+-echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
 +echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; }
-+kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -pg"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -4586,34 +5482,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -21711,96 +9228,91 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4626,16 +5520,16 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+
-+      CFLAGS="-pg $CFLAGS"
-+      CXXFLAGS="-pg $CXXFLAGS"
-+
-+else
+  :
+ 
+       CFLAGS="-pg $CFLAGS"
+       CXXFLAGS="-pg $CXXFLAGS"
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+  fi
-+
-+  if test "$kde_use_warnings" = "yes"; then
-+      if test "$GCC" = "yes"; then
-+        CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"
-+        case $host in
-+          *-*-linux-gnu)
-+            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"
-+
+  :
+ 
+ fi
+@@ -4650,16 +5544,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"
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
 +echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; }
-+kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -Wmissing-format-attribute"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -4686,34 +5579,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -21808,81 +9320,84 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4726,27 +5617,26 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"
-+else
+  :
+  CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
 +echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; }
-+kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cc_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -Wmissing-format-attribute"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4771,34 +5661,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -21890,86 +9405,88 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
+   eval "kde_cv_prog_cc_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CFLAGS="$save_CFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CFLAGS="$save_CFLAGS"
+   ac_ext=c
+@@ -4811,13 +5699,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
-+else
+  :
+  CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+          ;;
-+        esac
-+
+  :
+ 
+ fi
+@@ -4825,16 +5713,15 @@
+           ;;
+         esac
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
 +echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; }
-+kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -Wundef"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -4861,34 +5748,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -21977,84 +9494,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4901,28 +5786,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="-Wundef $CXXFLAGS"
-+else
+  :
+  CXXFLAGS="-Wundef $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
 +echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; }
-+kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -Wno-long-long"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -4949,34 +5833,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22062,84 +9581,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4989,28 +5871,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="-Wno-long-long $CXXFLAGS"
-+else
+  :
+  CXXFLAGS="-Wno-long-long $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
 +echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; }
-+kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -5037,34 +5918,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22147,104 +9668,106 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5077,13 +5956,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
-+else
+  :
+  CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+     fi
-+  fi
-+
-+  if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then
-+    CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
-+  fi
-+
+  :
+ 
+ fi
+@@ -5095,13 +5974,13 @@
+     CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
+   fi
+ 
+-  # Check whether --enable-pch or --disable-pch was given.
 +  # Check whether --enable-pch was given.
-+if test "${enable_pch+set}" = set; then
+ if test "${enable_pch+set}" = set; then
+-  enableval="$enable_pch"
+-   kde_use_pch=$enableval
 +  enableval=$enable_pch;  kde_use_pch=$enableval
-+else
-+   kde_use_pch=no
+ else
+    kde_use_pch=no
+-fi;
 +fi
 +
-+
-+  HAVE_GCC_VISIBILITY=0
-+
-+
-+  if test "$GXX" = "yes"; then
-+    gcc_no_reorder_blocks=NO
-+
+ 
+   HAVE_GCC_VISIBILITY=0
+ 
+@@ -5109,16 +5988,15 @@
+   if test "$GXX" = "yes"; then
+     gcc_no_reorder_blocks=NO
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
 +echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; }
-+kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -5145,34 +6023,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22252,90 +9775,88 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5185,13 +6061,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ gcc_no_reorder_blocks=YES
-+else
+  :
+  gcc_no_reorder_blocks=YES
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+    if test $kde_use_debug_code != "no" && \
-+       test $kde_use_debug_code != "full" && \
-+       test "YES" = "$gcc_no_reorder_blocks" ; then
-+          CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
-+          CFLAGS="$CFLAGS -fno-reorder-blocks"
-+    fi
-+
+  :
+ 
+ fi
+@@ -5203,16 +6079,15 @@
+           CFLAGS="$CFLAGS -fno-reorder-blocks"
+     fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
 +echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; }
-+kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -fno-exceptions"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -5239,34 +6114,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22343,84 +9864,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5279,28 +6152,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="$CXXFLAGS -fno-exceptions"
-+else
+  :
+  CXXFLAGS="$CXXFLAGS -fno-exceptions"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
 +echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; }
-+kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -fno-check-new"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -5327,34 +6199,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22428,84 +9951,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5367,28 +6237,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="$CXXFLAGS -fno-check-new"
-+else
+  :
+  CXXFLAGS="$CXXFLAGS -fno-check-new"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
 +echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; }
-+kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -fno-common"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -5415,34 +6284,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22513,84 +10038,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5455,28 +6322,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="$CXXFLAGS -fno-common"
-+else
+  :
+  CXXFLAGS="$CXXFLAGS -fno-common"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
 +echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; }
-+kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -fexceptions"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -5503,34 +6369,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22598,113 +10125,119 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5543,13 +6407,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ USE_EXCEPTIONS="-fexceptions"
-+else
+  :
+  USE_EXCEPTIONS="-fexceptions"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+ USE_EXCEPTIONS=
-+fi
-+
-+    ENABLE_PERMISSIVE_FLAG="-fpermissive"
-+
-+    if test "$kde_use_pch" = "yes"; then
+  :
+  USE_EXCEPTIONS=
+ fi
+@@ -5557,37 +6421,37 @@
+     ENABLE_PERMISSIVE_FLAG="-fpermissive"
+ 
+     if test "$kde_use_pch" = "yes"; then
+-        echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6
 +        { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
 +echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; }
-+        echo >conftest.h
-+        if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
-+            kde_gcc_supports_pch=yes
+         echo >conftest.h
+         if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
+             kde_gcc_supports_pch=yes
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +            { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+        else
-+            kde_gcc_supports_pch=no
+         else
+             kde_gcc_supports_pch=no
+-            echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +            { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+        fi
-+        if test "$kde_gcc_supports_pch" = "yes"; then
+         fi
+         if test "$kde_gcc_supports_pch" = "yes"; then
+-            echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6
 +            { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
 +echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; }
-+            if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
-+                kde_gcc_supports_pch=yes
+             if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
+                 kde_gcc_supports_pch=yes
+-                echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +                { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+            else
-+                kde_gcc_supports_pch=no
+             else
+                 kde_gcc_supports_pch=no
+-                echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +                { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+            fi
-+        fi
-+        rm -f conftest.h conftest.h.gch
-+    fi
-+
-+
+             fi
+         fi
+         rm -f conftest.h conftest.h.gch
+     fi
+ 
+ 
+-  echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
+-echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
 +echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; }
-+if test "${kde_cv_opt_noinline_match+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+  kde_cv_opt_noinline_match=irrelevant
-+    if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
-+     && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
-+
-+    ac_cflags_save="$CFLAGS"
-+    CFLAGS="$CFLAGS -D_USE_GNU"
-+
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+  #include <string.h>
-+
-+int
-+main ()
-+{
-+  const char *pt, *et;
-+  et = __extension__      ({ char __a0, __a1, __a2;       (__builtin_constant_p (  ";,"  ) && ((size_t)(const void *)((   ";,"   )+ 1) - (size_t)(const void *)(   ";,"   ) == 1)        ? ((__a0 =((__const char  *) (  ";,"  ))[0], __a0 == '\0')     ? ((void) (  pt ),((void *)0) )        : ((__a1 = ((__const char *) (  ";,"  ))[1], __a1== '\0')      ? (__extension__ (__builtin_constant_p (  __a0 ) && ( __a0 ) == '\0'   ? (char *) __rawmemchr (   pt  ,   __a0)       : strchr(   pt  ,   __a0 )))   : ((__a2 = ((__const char *) (  ";,"  ))[2], __a2 == '\0')      ? __strpbrk_c2 (  pt , __a0, __a1)      :(((__const char *) (  ";,"  ))[3] == '\0'     ? __strpbrk_c3 (  pt ,__a0, __a1, __a2): strpbrk (  pt ,   ";,"  ))))) : strpbrk (  pt ,  ";,"  )); }) ;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ if test "${kde_cv_opt_noinline_match+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5619,44 +6483,41 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22712,88 +10245,82 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   kde_cv_opt_noinline_match=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_opt_noinline_match=no
 +	kde_cv_opt_noinline_match=no
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+
-+    CFLAGS="$ac_cflags_save"
-+  fi
-+
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ 
+     CFLAGS="$ac_cflags_save"
+   fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
+-echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
 +echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; }
-+
-+    if test "x$kde_cv_opt_noinline_match" = "xno" ; then
-+       CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-+    fi
-+  fi
-+
-+
-+if test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes"; then
-+  unsermake_enable_pch_TRUE=
-+  unsermake_enable_pch_FALSE='#'
-+else
-+  unsermake_enable_pch_TRUE='#'
-+  unsermake_enable_pch_FALSE=
-+fi
-+
-+  if test "$CXX" = "KCC"; then
-+
-+    if test "$kde_use_pch" = "yes"; then
-+
+ 
+     if test "x$kde_cv_opt_noinline_match" = "xno" ; then
+        CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
+@@ -5676,16 +6537,15 @@
+ 
+     if test "$kde_use_pch" = "yes"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
+-echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
 +echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; }
-+kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS --pch"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -5712,34 +6572,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22801,85 +10328,87 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5752,29 +6610,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="$CXXFLAGS --pch"
-+else
+  :
+  CXXFLAGS="$CXXFLAGS --pch"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+                                              fi
-+
+  :
+ 
+ fi
+ 
+                                               fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
 +echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; }
-+kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -5801,34 +6658,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22887,84 +10416,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5841,28 +6696,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
-+else
+  :
+  CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
 +echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; }
-+kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -5889,34 +6743,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22972,84 +10503,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5929,28 +6781,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
-+else
+  :
+  CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
 +echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; }
-+kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -5977,34 +6828,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -23057,84 +10590,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6017,28 +6866,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
-+else
+  :
+  CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
 +echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; }
-+kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -6065,34 +6913,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -23142,84 +10677,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6105,28 +6951,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
-+else
+  :
+  CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
+-echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
 +echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; }
-+kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS --one_per"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -6153,34 +6998,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -23227,186 +10764,84 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6193,13 +7036,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ CXXFLAGS="$CXXFLAGS --one_per"
-+else
+  :
+  CXXFLAGS="$CXXFLAGS --one_per"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+  fi
-+
-+    USE_RTTI=
-+
-+
-+  case "$host" in
-+      *-*-irix*)  test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;;
-+      *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";;
-+      *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";;
-+      *-*-solaris*)
-+        if test "$GXX" = yes; then
-+          libstdcpp=`$CXX -print-file-name=libstdc++.so`
-+          if test ! -f $libstdcpp; then
-+             { { echo "$as_me:$LINENO: error: You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so" >&5
-+echo "$as_me: error: You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so" >&2;}
-+   { (exit 1); exit 1; }; }
-+          fi
-+        fi
-+        ;;
-+  esac
-+
-+  if test "x$kde_use_qt_emb" != "xyes"; then
-+  __val=$CXX
-+  __forbid=" -fno-rtti -rpath "
-+  if test -n "$__val"; then
-+    __new=""
-+    ac_save_IFS=$IFS
-+    IFS=" 	"
-+    for i in $__val; do
-+      case "$__forbid" in
-+        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXX, removing it" >&5
-+echo "$as_me: WARNING: found forbidden $i in CXX, removing it" >&2;} ;;
-+	*) # Careful to not add spaces, where there were none, because otherwise
-+	   # libtool gets confused, if we change e.g. CXX
-+	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-+      esac
-+    done
-+    IFS=$ac_save_IFS
-+    CXX=$__new
-+  fi
-+
-+  __val=$CXXFLAGS
-+  __forbid=" -fno-rtti -rpath "
-+  if test -n "$__val"; then
-+    __new=""
-+    ac_save_IFS=$IFS
-+    IFS=" 	"
-+    for i in $__val; do
-+      case "$__forbid" in
-+        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXXFLAGS, removing it" >&5
-+echo "$as_me: WARNING: found forbidden $i in CXXFLAGS, removing it" >&2;} ;;
-+	*) # Careful to not add spaces, where there were none, because otherwise
-+	   # libtool gets confused, if we change e.g. CXX
-+	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-+      esac
-+    done
-+    IFS=$ac_save_IFS
-+    CXXFLAGS=$__new
-+  fi
-+
-+else
-+  __val=$CXX
-+  __forbid=" -rpath "
-+  if test -n "$__val"; then
-+    __new=""
-+    ac_save_IFS=$IFS
-+    IFS=" 	"
-+    for i in $__val; do
-+      case "$__forbid" in
-+        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXX, removing it" >&5
-+echo "$as_me: WARNING: found forbidden $i in CXX, removing it" >&2;} ;;
-+	*) # Careful to not add spaces, where there were none, because otherwise
-+	   # libtool gets confused, if we change e.g. CXX
-+	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-+      esac
-+    done
-+    IFS=$ac_save_IFS
-+    CXX=$__new
-+  fi
-+
-+  __val=$CXXFLAGS
-+  __forbid=" -rpath "
-+  if test -n "$__val"; then
-+    __new=""
-+    ac_save_IFS=$IFS
-+    IFS=" 	"
-+    for i in $__val; do
-+      case "$__forbid" in
-+        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXXFLAGS, removing it" >&5
-+echo "$as_me: WARNING: found forbidden $i in CXXFLAGS, removing it" >&2;} ;;
-+	*) # Careful to not add spaces, where there were none, because otherwise
-+	   # libtool gets confused, if we change e.g. CXX
-+	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-+      esac
-+    done
-+    IFS=$ac_save_IFS
-+    CXXFLAGS=$__new
-+  fi
-+
-+fi
-+
-+
+  :
+ 
+ fi
+@@ -6306,13 +7149,13 @@
+ fi
+ 
+ 
+-  ac_ext=cc
 +  ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 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
+-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
-+if test -z "$CXXCPP"; then
-+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+      # Double quotes because CXXCPP needs to be expanded
-+    for CXXCPP in "$CXX -E" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
+ if test -z "$CXXCPP"; then
+   if test "${ac_cv_prog_CXXCPP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6342,24 +7185,22 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -23414,36 +10849,47 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6368,9 +7209,10 @@
+   # Broken: fails on valid input.
+ continue
+ fi
 +
-+  # Broken: fails on valid input.
-+continue
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
 +  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6380,24 +7222,22 @@
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -23451,67 +10897,54 @@
 +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
+   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; 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
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -6408,6 +7248,7 @@
+ ac_preproc_ok=:
+ break
+ fi
 +
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+  break
-+fi
-+
-+    done
-+    ac_cv_prog_CXXCPP=$CXXCPP
-+
-+fi
-+  CXXCPP=$ac_cv_prog_CXXCPP
-+else
-+  ac_cv_prog_CXXCPP=$CXXCPP
-+fi
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -6425,8 +7266,8 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:$LINENO: result: $CXXCPP" >&5
+-echo "${ECHO_T}$CXXCPP" >&6
 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
 +echo "${ECHO_T}$CXXCPP" >&6; }
-+ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+ do
+@@ -6449,24 +7290,22 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -23519,36 +10952,47 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6475,9 +7314,10 @@
+   # Broken: fails on valid input.
+ continue
+ fi
 +
-+  # Broken: fails on valid input.
-+continue
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
 +  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6487,24 +7327,22 @@
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -23556,87 +11000,64 @@
 +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
+   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; 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
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -6515,6 +7353,7 @@
+ ac_preproc_ok=:
+ break
+ fi
 +
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+  :
-+else
-+  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+  if test "$GCC" = yes; then
-+     NOOPT_CFLAGS=-O0
-+  fi
-+
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -6541,16 +7380,15 @@
+      NOOPT_CFLAGS=-O0
+   fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
+-echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
 +echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; }
-+kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -O0"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -6577,34 +7415,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -23644,123 +11065,125 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6617,22 +7453,21 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ NOOPT_CXXFLAGS=-O0
-+else
+  :
+  NOOPT_CXXFLAGS=-O0
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-  # Check whether --enable-coverage or --disable-coverage was given.
 +  # Check whether --enable-coverage was given.
-+if test "${enable_coverage+set}" = set; then
+ if test "${enable_coverage+set}" = set; then
+-  enableval="$enable_coverage"
+-
 +  enableval=$enable_coverage;
-+      if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
-+        ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
-+        ac_coverage_linker="-lgcc"
-+      elif test "$am_cv_CC_dependencies_compiler_type" = "gcc"; then
-+        ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
-+        ac_coverage_linker=""
-+      else
-+        { { echo "$as_me:$LINENO: error: coverage with your compiler is not supported" >&5
-+echo "$as_me: error: coverage with your compiler is not supported" >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+      CFLAGS="$CFLAGS $ac_coverage_compiler"
-+      CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
-+      LDFLAGS="$LDFLAGS $ac_coverage_linker"
-+
+       if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
+         ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
+         ac_coverage_linker="-lgcc"
+@@ -6648,36 +7483,36 @@
+       CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
+       LDFLAGS="$LDFLAGS $ac_coverage_linker"
+ 
+-fi;
 +fi
 +
-+
-+
-+
-+
-+
-+
+ 
+ 
+ 
+ 
+ 
+ 
+-  # Check whether --enable-new_ldflags or --disable-new_ldflags was given.
 +  # Check whether --enable-new_ldflags was given.
-+if test "${enable_new_ldflags+set}" = set; then
+ if test "${enable_new_ldflags+set}" = set; then
+-  enableval="$enable_new_ldflags"
+-  kde_use_new_ldflags=$enableval
 +  enableval=$enable_new_ldflags; kde_use_new_ldflags=$enableval
-+else
-+  kde_use_new_ldflags=no
+ else
+   kde_use_new_ldflags=no
+-fi;
 +fi
 +
-+
-+  LDFLAGS_AS_NEEDED=""
-+  LDFLAGS_NEW_DTAGS=""
-+  if test "x$kde_use_new_ldflags" = "xyes"; then
-+       LDFLAGS_NEW_DTAGS=""
-+
+ 
+   LDFLAGS_AS_NEEDED=""
+   LDFLAGS_NEW_DTAGS=""
+   if test "x$kde_use_new_ldflags" = "xyes"; then
+        LDFLAGS_NEW_DTAGS=""
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
 +echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
-+kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -Wl,--enable-new-dtags"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -6704,34 +7539,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -23768,85 +11191,87 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6744,29 +7577,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
-+else
+  :
+  LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
-+
+  :
+ 
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
 +echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; }
-+kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -Wl,--as-needed"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -6793,34 +7625,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -23854,293 +11279,415 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6833,13 +7663,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ LDFLAGS_AS_NEEDED="-Wl,--as-needed"
-+else
+  :
+  LDFLAGS_AS_NEEDED="-Wl,--as-needed"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+  fi
-+
-+
-+
-+
+  :
+ 
+ fi
+@@ -6849,13 +7679,13 @@
+ 
+ 
+ 
+-  # Check whether --enable-final or --disable-final was given.
 +  # Check whether --enable-final was given.
-+if test "${enable_final+set}" = set; then
+ if test "${enable_final+set}" = set; then
+-  enableval="$enable_final"
+-  kde_use_final=$enableval
 +  enableval=$enable_final; kde_use_final=$enableval
-+else
-+  kde_use_final=no
+ else
+   kde_use_final=no
+-fi;
 +fi
 +
-+
-+  if test "x$kde_use_final" = "xyes"; then
-+      KDE_USE_FINAL_TRUE=""
-+      KDE_USE_FINAL_FALSE="#"
-+   else
-+      KDE_USE_FINAL_TRUE="#"
-+      KDE_USE_FINAL_FALSE=""
-+  fi
-+
-+
-+
-+
+ 
+   if test "x$kde_use_final" = "xyes"; then
+       KDE_USE_FINAL_TRUE=""
+@@ -6868,13 +7698,13 @@
+ 
+ 
+ 
+-  # Check whether --enable-closure or --disable-closure was given.
 +  # Check whether --enable-closure was given.
-+if test "${enable_closure+set}" = set; then
+ if test "${enable_closure+set}" = set; then
+-  enableval="$enable_closure"
+-  kde_use_closure=$enableval
 +  enableval=$enable_closure; kde_use_closure=$enableval
-+else
-+  kde_use_closure=no
+ else
+   kde_use_closure=no
+-fi;
 +fi
 +
-+
-+  KDE_NO_UNDEFINED=""
-+  if test "x$kde_use_closure" = "xyes"; then
-+       KDE_USE_CLOSURE_TRUE=""
-+       KDE_USE_CLOSURE_FALSE="#"
-+#       CXXFLAGS="$CXXFLAGS $REPO"
-+  else
-+       KDE_USE_CLOSURE_TRUE="#"
-+       KDE_USE_CLOSURE_FALSE=""
-+       KDE_NO_UNDEFINED=""
-+  fi
-+
-+
-+
-+
-+
+ 
+   KDE_NO_UNDEFINED=""
+   if test "x$kde_use_closure" = "xyes"; then
+@@ -6885,198 +7715,19 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in
+-         *-*-linux-gnu)
+-
+-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
+-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'
+-
+-
+-  save_CXXFLAGS="$CXXFLAGS"
+-  CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
+-  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;
+-  ;
+-  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_cxx_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
+-  eval "kde_cv_prog_cxx_$kde_cache=yes"
+-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
+-  CXXFLAGS="$save_CXXFLAGS"
+-  ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-fi
+-
+-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+-
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
+-kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-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'
+-
+-
+-  save_CXXFLAGS="$CXXFLAGS"
+-  CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
+-  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;
+-  ;
+-  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_cxx_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
+-  eval "kde_cv_prog_cxx_$kde_cache=yes"
+-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
+-  CXXFLAGS="$save_CXXFLAGS"
+-  ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-fi
+-
+-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+- KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- :
+- KDE_NO_UNDEFINED=""
+-fi
+-
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- :
+- KDE_NO_UNDEFINED=""
+-fi
+-
+-           ;;
+-       esac
+   fi
+ 
+ 
+ 
+ 
+ 
+-  # Check whether --enable-nmcheck or --disable-nmcheck was given.
 +  # Check whether --enable-nmcheck was given.
-+if test "${enable_nmcheck+set}" = set; then
+ if test "${enable_nmcheck+set}" = set; then
+-  enableval="$enable_nmcheck"
+-  kde_use_nmcheck=$enableval
 +  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
-+else
-+  kde_use_nmcheck=no
+ else
+   kde_use_nmcheck=no
+-fi;
 +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
-+
-+
-+
-+
-+
-+
+ 
+   if test "$kde_use_nmcheck" = "yes"; then
+       KDE_USE_NMCHECK_TRUE=""
+@@ -7091,10 +7742,9 @@
+ 
+ 
+ 
+-# Check whether --enable-shared or --disable-shared was given.
 +# Check whether --enable-shared was given.
-+if test "${enable_shared+set}" = set; then
+ if test "${enable_shared+set}" = set; then
+-  enableval="$enable_shared"
+-  p=${PACKAGE-default}
 +  enableval=$enable_shared; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
-+    *)
-+      enable_shared=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_shared=yes
+     case $enableval in
+     yes) enable_shared=yes ;;
+     no) enable_shared=no ;;
+@@ -7113,12 +7763,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
+ if test "${enable_static+set}" = set; then
+-  enableval="$enable_static"
+-  p=${PACKAGE-default}
 +  enableval=$enable_static; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_static=yes ;;
-+    no) enable_static=no ;;
-+    *)
-+     enable_static=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_static=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_static=no
+     case $enableval in
+     yes) enable_static=yes ;;
+     no) enable_static=no ;;
+@@ -7137,18 +7787,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
+ if test "${enable_libsuffix+set}" = set; then
+-  enableval="$enable_libsuffix"
+-  kdelibsuff=$enableval
 +  enableval=$enable_libsuffix; kdelibsuff=$enableval
-+else
-+  kdelibsuff="auto"
+ else
+   kdelibsuff="auto"
+-fi;
 +fi
 +
-+
-+    if test "$kdelibsuff" = "auto"; then
-+
-+cat > conftest.c << EOF
-+#include <stdio.h>
-+int main() {
-+ return 0;
-+}
-+EOF
-+        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
-+    s,.*/lib\([^\/]*\)/.*,\1,
-+    p
-+}'`
-+	rm -rf conftest.*
-+    fi
-+
-+    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
-+       kdelibsuff=
-+    fi
-+    if test -z "$kdelibsuff"; then
+ 
+     if test "$kdelibsuff" = "auto"; then
+ 
+@@ -7169,8 +7820,8 @@
+        kdelibsuff=
+     fi
+     if test -z "$kdelibsuff"; then
+-        echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
+-echo "${ECHO_T}not using lib directory suffix" >&6
 +        { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
 +echo "${ECHO_T}not using lib directory suffix" >&6; }
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define KDELIBSUFF ""
-+_ACEOF
-+
-+    else
-+        if test "$libdir" = '${exec_prefix}/lib'; then
-+            libdir="$libdir${kdelibsuff}"
-+            libdir="$libdir"
-+          fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define KDELIBSUFF "${kdelibsuff}"
-+_ACEOF
-+
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define KDELIBSUFF ""
+@@ -7186,14 +7837,13 @@
+ #define KDELIBSUFF "${kdelibsuff}"
+ _ACEOF
+ 
+-        echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
+-echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6
 +        { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
 +echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; }
-+    fi
-+
+     fi
+ 
+-# Check whether --enable-fast-install or --disable-fast-install was given.
 +# Check whether --enable-fast-install was given.
-+if test "${enable_fast_install+set}" = set; then
+ if test "${enable_fast_install+set}" = set; then
+-  enableval="$enable_fast_install"
+-  p=${PACKAGE-default}
 +  enableval=$enable_fast_install; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_fast_install=yes ;;
-+    no) enable_fast_install=no ;;
-+    *)
-+      enable_fast_install=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_fast_install=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_fast_install=yes
+     case $enableval in
+     yes) enable_fast_install=yes ;;
+     no) enable_fast_install=no ;;
+@@ -7212,10 +7862,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
-+  # Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for lt_ac_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-+      fi
-+    done
-+  done
-+done
-+lt_ac_max=0
-+lt_ac_count=0
-+# 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
+ if test "${lt_cv_path_SED+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7239,7 +7890,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
+-  test ! -f $lt_ac_sed && break
 +  test ! -f $lt_ac_sed && continue
-+  cat /dev/null > conftest.in
-+  lt_ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+  # Check for GNU sed and select it if it is found.
-+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+    lt_cv_path_SED=$lt_ac_sed
-+    break
-+  fi
-+  while true; do
-+    cat conftest.in conftest.in >conftest.tmp
-+    mv conftest.tmp conftest.in
-+    cp conftest.in conftest.nl
-+    echo >>conftest.nl
-+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+    cmp -s conftest.out conftest.nl || break
-+    # 10000 chars as input seems more than enough
-+    test $lt_ac_count -gt 10 && break
-+    lt_ac_count=`expr $lt_ac_count + 1`
-+    if test $lt_ac_count -gt $lt_ac_max; then
-+      lt_ac_max=$lt_ac_count
-+      lt_cv_path_SED=$lt_ac_sed
-+    fi
-+  done
-+done
-+
-+fi
-+
-+SED=$lt_cv_path_SED
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+@@ -7268,37 +7919,184 @@
+ fi
+ 
+ SED=$lt_cv_path_SED
+-echo "$as_me:$LINENO: result: $SED" >&5
+-echo "${ECHO_T}$SED" >&6
 +{ echo "$as_me:$LINENO: result: $SED" >&5
 +echo "${ECHO_T}$SED" >&6; }
 +
@@ -24201,8 +11748,11 @@
 +
 +done
 +IFS=$as_save_IFS
+ 
+-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
 +
-+
 +fi
 +
 +GREP="$ac_cv_path_GREP"
@@ -24235,8 +11785,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
@@ -24269,7 +11822,7 @@
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_EGREP="$ac_path_EGREP"
 +      ac_path_EGREP_max=$ac_count
-+    fi
+     fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
@@ -24300,134 +11853,121 @@
 +
 +
 +   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
 +{ 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
+ if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
 +  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-+else
-+  with_gnu_ld=no
+ else
+   with_gnu_ld=no
+-fi;
 +fi
 +
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [\\/]* | ?:[\\/]*)
-+      re_direlt='/[^/][^/]*/\.\./'
-+      # Canonicalize the pathname of ld
-+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
+   case $host in
+   *-*-mingw*)
+     # gcc leaves a trailing carriage return which upsets mingw
+@@ -7327,11 +8125,11 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for GNU ld" >&5
 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
-+fi
-+if test "${lt_cv_path_LD+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    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,
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7344,7 +8142,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,
+-      # but apparently some GNU ld's only accept -v.
 +      # but apparently some variants of GNU ld only accept -v.
-+      # 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'*)
-+	test "$with_gnu_ld" != no && break
-+	;;
-+      *)
-+	test "$with_gnu_ld" != yes && break
-+	;;
-+      esac
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi
-+fi
-+
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
+       # 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'*)
+@@ -7364,21 +8162,21 @@
+ 
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+-  echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
 +  { echo "$as_me:$LINENO: result: $LD" >&5
 +echo "${ECHO_T}$LD" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+   { (exit 1); exit 1; }; }
+ fi
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 +  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+  lt_cv_prog_gnu_ld=yes
-+  ;;
-+*)
-+  lt_cv_prog_gnu_ld=no
-+  ;;
-+esac
-+fi
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -7388,29 +8186,38 @@
+   ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+
-+
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+ 
+ 
+-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
-+if test "${lt_cv_ld_reload_flag+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_ld_reload_flag='-r'
-+fi
+ if test "${lt_cv_ld_reload_flag+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   lt_cv_ld_reload_flag='-r'
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+ "" | " "*) ;;
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
 +case $host_os in
 +  darwin*)
 +    if test "$GCC" = yes; then
@@ -24437,16 +11977,37 @@
 +    fi
 +    ;;
 +esac
-+
+ 
+-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
-+if test "${lt_cv_path_NM+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
+ if test "${lt_cv_path_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7418,56 +8225,63 @@
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-      */dev/null* | *'Invalid file or object type'*)
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-        ;;
+-      *)
+-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null*)
+-	  lt_cv_path_NM="$tmp_nm -p"
 +  lt_nm_to_check="${ac_tool_prefix}nm"
 +  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
 +    lt_nm_to_check="$lt_nm_to_check nm"
@@ -24465,9 +12026,11 @@
 +	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
 +	*/dev/null* | *'Invalid file or object type'*)
 +	  lt_cv_path_NM="$tmp_nm -B"
-+	  break
-+	  ;;
-+	*)
+ 	  break
+ 	  ;;
+ 	*)
+-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	  continue # so that we can try to find one that supports BSD flags
 +	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 +	  */dev/null*)
 +	    lt_cv_path_NM="$tmp_nm -p"
@@ -24478,365 +12041,301 @@
 +	    continue # so that we can try to find one that supports BSD flags
 +	    ;;
 +	  esac
-+	  ;;
-+	esac
+ 	  ;;
+ 	esac
+-      esac
+-    fi
 +      fi
 +    done
 +    IFS="$lt_save_ifs"
-+  done
-+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+fi
-+fi
+   done
+-  IFS="$lt_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-echo "${ECHO_T}$lt_cv_path_NM" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
 +echo "${ECHO_T}$lt_cv_path_NM" >&6; }
-+NM="$lt_cv_path_NM"
-+
+ NM="$lt_cv_path_NM"
+ 
+-echo "$as_me:$LINENO: checking whether ln -s works" >&5
+-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-+LN_S=$as_ln_s
-+if test "$LN_S" = "ln -s"; then
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-echo "${ECHO_T}no, using $LN_S" >&6
 +  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
 +echo "${ECHO_T}no, using $LN_S" >&6; }
-+fi
-+
+ fi
+ 
+-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
-+if test "${lt_cv_deplibs_check_method+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7494,44 +8308,36 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-bsdi4*)
 +bsdi[45]*)
-+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
-+
-+cygwin*)
+   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+ cygwin*)
+-  lt_cv_deplibs_check_method=pass_all
 +  # func_win32_libid is a shell function defined in ltmain.sh
 +  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 +  lt_cv_file_magic_cmd='func_win32_libid'
-+  ;;
-+
-+mingw* | pw32*)
+   ;;
+ 
+ mingw* | pw32*)
+-  # win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='win32_libid'
 +  # Base MSYS/MinGW do not provide the 'file' command needed by
 +  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
 +  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
 +  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
+   ;;
+ 
+ darwin* | rhapsody*)
+-  # this will be overwritten by pass_all, but leave it in just in case
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[012])
+-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+-    ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+-    ;;
+-  esac
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu)
 +freebsd* | dragonfly*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
 +      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20* | hpux11*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -7547,7 +8353,7 @@
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
 +  case $host_cpu in
-+  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
-+    ;;
-+  hppa*64*)
-+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+    ;;
-+  *)
-+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+    ;;
-+  esac
-+  ;;
-+
+   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
+@@ -7563,43 +8369,27 @@
+   esac
+   ;;
+ 
 +interix3*)
 +  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
 +  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
 +  ;;
 +
-+irix5* | irix6* | nonstopux*)
+ irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case $LD in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+-    ;;
 +  case $LD in
 +  *-32|*"-32 ") libmagic=32-bit;;
 +  *-n32|*"-n32 ") libmagic=N32;;
 +  *-64|*"-64 ") libmagic=64-bit;;
 +  *) libmagic=never-match;;
-+  esac
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
+-  case $host_cpu in
+-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+-  arm* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
 +linux* | k*bsd*-gnu)
 +  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
+   ;;
+ 
+-netbsd*)
 +netbsd* | netbsdelf*-gnu)
-+  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
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+nto-qnx*)
-+  lt_cv_deplibs_check_method=unknown
-+  ;;
-+
-+openbsd*)
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+   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
+@@ -7618,32 +8408,22 @@
+   ;;
+ 
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
 +    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-+  else
+   else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
 +    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
+   fi
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-sco3.2v5*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +sysv4 | sysv4.3*)
-+  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]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
+   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]'
+@@ -7664,17 +8444,20 @@
+   siemens)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
 +  pc)
 +    lt_cv_deplibs_check_method=pass_all
 +    ;;
-+  esac
-+  ;;
-+
+   esac
+   ;;
+ 
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+esac
-+
-+fi
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
-+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
-+
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
+ 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
+@@ -7683,14 +8466,17 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 +
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ 
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
 +# Check whether --enable-libtool-lock was given.
-+if test "${enable_libtool_lock+set}" = set; then
+ if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
 +  enableval=$enable_libtool_lock;
 +fi
-+
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *ELF-32*)
-+      HPUX_IA64_MODE="32"
-+      ;;
-+    *ELF-64*)
-+      HPUX_IA64_MODE="64"
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+*-*-irix6*)
-+  # Find out which ABI we are using.
+ 
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+ # Some flags need to be propagated to the compiler or linker for good
+@@ -7717,7 +8503,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 7720 "configure"' > conftest.$ac_ext
 +  echo '#line 8506 "configure"' > conftest.$ac_ext
-+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+   if test "$lt_cv_prog_gnu_ld" = yes; then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -melf32bsmip"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -melf32bmipn32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -melf64bmip"
-+      ;;
-+    esac
-+   else
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -32"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -n32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -64"
-+      ;;
-+    esac
-+   fi
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -7760,14 +8546,13 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-    case "`/usr/bin/file conftest.o`" in
 +    case `/usr/bin/file conftest.o` in
-+    *32-bit*)
-+      case $host in
-+        x86_64-*linux*)
-+          LD="${LD-ld} -m elf_i386"
-+          ;;
+     *32-bit*)
+-      LINUX_64_MODE="32"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
 +        ppc64-*linux*|powerpc64-*linux*)
-+          LD="${LD-ld} -m elf32ppclinux"
-+          ;;
-+        s390x-*linux*)
-+          LD="${LD-ld} -m elf_s390"
-+          ;;
-+        sparc64-*linux*)
-+          LD="${LD-ld} -m elf32_sparc"
-+          ;;
-+      esac
-+      ;;
-+    *64-bit*)
-+      case $host in
-+        x86_64-*linux*)
-+          LD="${LD-ld} -m elf_x86_64"
-+          ;;
-+        ppc*-*linux*|powerpc*-*linux*)
-+          LD="${LD-ld} -m elf64ppc"
-+          ;;
-+        s390*-*linux*)
-+          LD="${LD-ld} -m elf64_s390"
-+          ;;
-+        sparc*-*linux*)
-+          LD="${LD-ld} -m elf64_sparc"
-+          ;;
-+      esac
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -7779,7 +8564,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -7804,8 +8588,8 @@
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
-+if test "${lt_cv_cc_needs_belf+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+     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 conftest$ac_exeext
+ if test "${lt_cv_cc_needs_belf+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7831,35 +8615,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -24844,40 +12343,57 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   lt_cv_cc_needs_belf=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-lt_cv_cc_needs_belf=no
 +	lt_cv_cc_needs_belf=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+     ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+      ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7868,13 +8649,33 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
 +sparc*-*solaris*)
 +  # Find out which ABI we are using.
 +  echo 'int i;' > conftest.$ac_ext
@@ -24898,38 +12414,26 @@
 +  rm -rf conftest*
 +  ;;
 +
-+
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+
-+
-+
+ 
+ esac
+ 
+@@ -7882,8 +8683,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7907,35 +8708,31 @@
+ }
+ _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;;
@@ -24937,104 +12441,64 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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
 +  (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
-+
+   ac_cv_header_stdc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_stdc=no
 +	ac_cv_header_stdc=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "memchr" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -7991,6 +8788,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <ctype.h>
 +#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "free" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+  if test "$cross_compiling" = yes; then
-+  :
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <ctype.h>
-+#include <stdlib.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+	|| toupper (i) != TOUPPER (i))
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -8010,18 +8808,27 @@
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
 +      return 2;
 +  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -25042,73 +12506,57 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  :
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_header_stdc=no
-+fi
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -8034,12 +8841,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
 +
 +
-+fi
-+fi
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define STDC_HEADERS 1
-+_ACEOF
-+
-+fi
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if test $ac_cv_header_stdc = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -8062,9 +8871,9 @@
+ 		  inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -8078,38 +8887,35 @@
+ #include <$ac_header>
+ _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;;
@@ -25116,65 +12564,83 @@
 +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
+   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
 +  (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=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
+ 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: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +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_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+
-+for ac_header in dlfcn.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -8124,18 +8930,19 @@
+ for ac_header in dlfcn.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8146,41 +8953,37 @@
+ #include <$ac_header>
+ _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;;
@@ -25182,38 +12648,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8189,24 +8992,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -25221,75 +12708,133 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -8214,9 +9015,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -8240,25 +9042,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -8270,176 +9066,437 @@
+ 
+ done
+ 
+-ac_ext=f
+-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+-  do
+-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_F77+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$F77"; then
+-  ac_cv_prog_F77="$F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+ 
+-fi
+-fi
+-F77=$ac_cv_prog_F77
+-if test -n "$F77"; then
+-  echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+ 
+-    test -n "$F77" && break
+-  done
+-fi
+-if test -z "$F77"; then
+-  ac_ct_F77=$F77
+-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
 +if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 +    (test "X$CXX" != "Xg++"))) ; then
@@ -25302,21 +12847,88 @@
 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
 +if test -z "$CXXCPP"; then
 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$ac_ct_F77"; then
+-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
 +      # Double quotes because CXXCPP needs to be expanded
 +    for CXXCPP in "$CXX -E" "/lib/cpp"
 +    do
 +      ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
-+do
+ do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_F77="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_F77=$ac_cv_prog_ac_ct_F77
+-if test -n "$ac_ct_F77"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-echo "${ECHO_T}$ac_ct_F77" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  test -n "$ac_ct_F77" && break
+-done
+-
+-  F77=$ac_ct_F77
+-fi
+-
+-
+-# Provide some information about the compiler.
+-echo "$as_me:8365:" \
+-     "checking for Fortran 77 compiler version" >&5
+-ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-rm -f a.out
+-
+-# If we don't use `.F' as extension, the preprocessor is not run on the
+-# input file.  (Note that this only needs to work for GNU compilers.)
+-ac_save_ext=$ac_ext
+-ac_ext=F
+-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 +  # Use a header file that comes with gcc, so configuring glibc
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
 +  # On the NeXT, cc -E runs the code through the compiler's parser,
 +  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat >conftest.$ac_ext <<_ACEOF
+   cat >conftest.$ac_ext <<_ACEOF
+-      program main
+-#ifndef __GNUC__
+-       choke me
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
@@ -25326,9 +12938,14 @@
 +# include <limits.h>
 +#else
 +# include <assert.h>
-+#endif
+ #endif
+-
+-      end
 +		     Syntax error
-+_ACEOF
+ _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_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -25336,11 +12953,23 @@
 +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
+   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=$?
 +  (exit $ac_status); } >/dev/null && {
 +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 +	 test ! -s conftest.err
@@ -25377,7 +13006,8 @@
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 +  (exit $ac_status); } >/dev/null && {
 +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 +	 test ! -s conftest.err
@@ -25699,36 +13329,41 @@
 +	 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=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
 +	ac_compiler_gnu=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-+
-+fi
+ ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
-+ac_ext=$ac_save_ext
-+ac_test_FFLAGS=${FFLAGS+set}
-+ac_save_FFLAGS=$FFLAGS
-+FFLAGS=
+ ac_ext=$ac_save_ext
+ ac_test_FFLAGS=${FFLAGS+set}
+ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_f77_g+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  FFLAGS=-g
-+cat >conftest.$ac_ext <<_ACEOF
-+      program main
-+
-+      end
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_prog_f77_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8450,39 +9507,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;;
@@ -25736,91 +13371,71 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_f77_g=no
 +	ac_cv_prog_f77_g=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
-+if test "$ac_test_FFLAGS" = set; then
-+  FFLAGS=$ac_save_FFLAGS
-+elif test $ac_cv_prog_f77_g = yes; then
-+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-+    FFLAGS="-g -O2"
-+  else
-+    FFLAGS="-g"
-+  fi
-+else
-+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-+    FFLAGS="-O2"
-+  else
-+    FFLAGS=
-+  fi
-+fi
-+
-+G77=`test $ac_compiler_gnu = yes && echo yes`
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-+
-+# find the maximum length of command line arguments
+ if test "$ac_test_FFLAGS" = set; then
+   FFLAGS=$ac_save_FFLAGS
+ elif test $ac_cv_prog_f77_g = yes; then
+@@ -8511,13 +9564,13 @@
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+ 
+ # find the maximum length of command line arguments
+-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+    i=0
+ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+     i=0
+-  testring="ABCD"
 +  teststring="ABCD"
-+
-+  case $build_os in
-+  msdosdjgpp*)
-+    # On DJGPP, this test can blow up pretty badly due to problems in libc
-+    # (any single argument exceeding 2000 bytes causes a buffer overrun
-+    # during glob expansion).  Even if it were fixed, the result of this
-+    # check would be larger than it should be.
-+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-+    ;;
-+
-+  gnu*)
-+    # Under GNU Hurd, this test is not required because there is
-+    # no limit to the length of command line arguments.
-+    # Libtool will interpret -1 as no limit whatsoever
-+    lt_cv_sys_max_cmd_len=-1;
-+    ;;
-+
-+  cygwin* | mingw*)
-+    # On Win9x/ME, this test blows up -- it succeeds, but takes
-+    # about 5 minutes as the teststring grows exponentially.
-+    # Worse, since 9x/ME are not pre-emptively multitasking,
-+    # you end up with a "frozen" computer, even though with patience
-+    # the test eventually succeeds (with a max line length of 256k).
-+    # Instead, let's just punt: use the minimum linelength reported by
-+    # all of the supported platforms: 8192 (on NT/2K/XP).
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -8546,20 +9599,70 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
 +  amigaos*)
 +    # On AmigaOS with pdksh, this test takes hours, literally.
 +    # So we just punt and use a minimum line length of 8192.
@@ -25871,77 +13486,68 @@
 +    fi
 +    ;;
 +  *)
-+    # If test is not a shell built-in, we'll probably end up computing a
-+    # maximum length that is only half of the actual maximum length, but
-+    # we can't tell.
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
 +    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
 +    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 +	       = "XX$teststring") >/dev/null 2>&1 &&
 +	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+	    lt_cv_sys_max_cmd_len=$new_result &&
-+	    test $i != 17 # 1/2 MB should be enough
-+    do
-+      i=`expr $i + 1`
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
 +      teststring=$teststring$teststring
-+    done
+     done
+-    testring=
 +    teststring=
-+    # Add a significant safety factor because C++ compilers can tack on massive
-+    # amounts of additional arguments before passing them to the linker.
-+    # It appears as though 1/2 is a usable value.
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+    ;;
-+  esac
-+
-+fi
-+
-+if test -n $lt_cv_sys_max_cmd_len ; then
+     # Add a significant safety factor because C++ compilers can tack on massive
+     # amounts of additional arguments before passing them to the linker.
+     # It appears as though 1/2 is a usable value.
+@@ -8570,19 +9673,19 @@
+ fi
+ 
+ if test -n $lt_cv_sys_max_cmd_len ; then
+-  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
 +  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: none" >&5
+-echo "${ECHO_T}none" >&6
 +  { echo "$as_me:$LINENO: result: none" >&5
 +echo "${ECHO_T}none" >&6; }
-+fi
-+
-+
-+
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
+ fi
+ 
+ 
+ 
+ 
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[BCDEGRST]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[BCDT]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[ABCDGISTW]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  if test "$host_cpu" = ia64; then
-+    symcode='[ABCDEGRST]'
-+  fi
-+  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'"
-+  ;;
+ if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8596,9 +9699,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+@@ -8620,14 +9720,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'"
+   ;;
 +linux* | k*bsd*-gnu)
 +  if test "$host_cpu" = ia64; then
 +    symcode='[ABCDGIRSTW]'
@@ -25949,12 +13555,14 @@
 +    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'"
 +  fi
 +  ;;
-+irix* | nonstopux*)
-+  symcode='[BCDEGRST]'
-+  ;;
-+osf*)
-+  symcode='[BCDEGQRST]'
-+  ;;
+ irix* | nonstopux*)
+   symcode='[BCDEGRST]'
+   ;;
+ osf*)
+   symcode='[BCDEGQRST]'
+   ;;
+-solaris* | sysv5*)
+-  symcode='[BDT]'
 +solaris*)
 +  symcode='[BDRT]'
 +  ;;
@@ -25966,299 +13574,164 @@
 +  ;;
 +sysv5* | sco5v6* | unixware* | OpenUNIX*)
 +  symcode='[ABDT]'
-+  ;;
-+sysv4)
-+  symcode='[DFNSTU]'
-+  ;;
-+esac
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
+   ;;
+ sysv4)
+   symcode='[DFNSTU]'
+@@ -8645,14 +9761,17 @@
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+-  symcode='[ABCDGISTW]' ;;
 +  symcode='[ABCDGIRSTW]' ;;
-+esac
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
+ esac
+ 
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
+ 
 +  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
 +  symxfrm="\\1 $ac_symprfx\\2 \\2"
 +
-+  # Write the raw and C identifiers.
+   # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
 +  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-+
-+	  cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr_t void *
-+#else
-+# define lt_ptr_t char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr_t address;
-+}
-+lt_preloaded_symbols[] =
-+{
-+EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-+	  cat <<\EOF >> conftest.$ac_ext
-+  {0, (lt_ptr_t) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  lt_save_LIBS="$LIBS"
-+	  lt_save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-+	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$lt_save_LIBS"
-+	  CFLAGS="$lt_save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&5
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&5
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&5
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -f conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+
-+fi
-+
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  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
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+@@ -8770,15 +9889,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
+-  echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
 +  { echo "$as_me:$LINENO: result: failed" >&5
 +echo "${ECHO_T}failed" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6
 +  { echo "$as_me:$LINENO: result: ok" >&5
 +echo "${ECHO_T}ok" >&6; }
-+fi
-+
+ fi
+ 
+-echo "$as_me:$LINENO: checking for objdir" >&5
+-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for objdir" >&5
 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-+if test "${lt_cv_objdir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  lt_cv_objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null
-+fi
+ if test "${lt_cv_objdir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8792,8 +9911,8 @@
+ fi
+ rmdir .libs 2>/dev/null
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+-echo "${ECHO_T}$lt_cv_objdir" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
 +echo "${ECHO_T}$lt_cv_objdir" >&6; }
-+objdir=$lt_cv_objdir
-+
-+
-+
-+
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
+ objdir=$lt_cv_objdir
+ 
+ 
+@@ -8814,7 +9933,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
 +Xsed='sed -e 1s/^X//'
-+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
-+# Constants:
-+rm="rm -f"
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+
+ sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+ 
+ # Same as above, but do not quote variable references.
+@@ -8834,7 +9953,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
 +# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+
-+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
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -8844,8 +9963,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8858,32 +9977,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_AR="${ac_tool_prefix}ar"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
+ 
+ fi
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:$LINENO: result: $AR" >&5
+-echo "${ECHO_T}$AR" >&6
 +  { echo "$as_me:$LINENO: result: $AR" >&5
 +echo "${ECHO_T}$AR" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+fi
-+if test -z "$ac_cv_prog_AR"; then
-+  ac_ct_AR=$AR
-+  # Extract the first word of "ar", so it can be a program name with args.
-+set dummy ar; ac_word=$2
+ fi
+ if test -z "$ac_cv_prog_AR"; then
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8896,27 +10017,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_ac_ct_AR="ar"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
+ 
+-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
+ fi
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-echo "${ECHO_T}$ac_ct_AR" >&6
 +  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
 +echo "${ECHO_T}$ac_ct_AR" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
+ fi
+ 
+-  AR=$ac_ct_AR
 +  if test "x$ac_ct_AR" = x; then
 +    AR="false"
 +  else
@@ -26274,87 +13747,93 @@
 +esac
 +    AR=$ac_ct_AR
 +  fi
-+else
-+  AR="$ac_cv_prog_AR"
-+fi
-+
-+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
+ else
+   AR="$ac_cv_prog_AR"
+ fi
+@@ -8924,8 +10059,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8938,32 +10073,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
+ 
+ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
 +  { echo "$as_me:$LINENO: result: $RANLIB" >&5
 +echo "${ECHO_T}$RANLIB" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+  ac_ct_RANLIB=$RANLIB
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
+ fi
+ if test -z "$ac_cv_prog_RANLIB"; then
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_RANLIB"; then
-+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8976,27 +10113,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
+ 
+-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
 +  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
+ fi
+ 
+-  RANLIB=$ac_ct_RANLIB
 +  if test "x$ac_ct_RANLIB" = x; then
 +    RANLIB=":"
 +  else
@@ -26370,87 +13849,93 @@
 +esac
 +    RANLIB=$ac_ct_RANLIB
 +  fi
-+else
-+  RANLIB="$ac_cv_prog_RANLIB"
-+fi
-+
-+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
+ else
+   RANLIB="$ac_cv_prog_RANLIB"
+ fi
+@@ -9004,8 +10155,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9018,32 +10169,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
+ 
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
 +  { echo "$as_me:$LINENO: result: $STRIP" >&5
 +echo "${ECHO_T}$STRIP" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9056,27 +10209,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_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
-+  fi
-+done
-+done
+     ac_cv_prog_ac_ct_STRIP="strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
+ 
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
 +  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
 +echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
+ fi
+ 
+-  STRIP=$ac_ct_STRIP
 +  if test "x$ac_ct_STRIP" = x; then
 +    STRIP=":"
 +  else
@@ -26466,49 +13951,32 @@
 +esac
 +    STRIP=$ac_ct_STRIP
 +  fi
-+else
-+  STRIP="$ac_cv_prog_STRIP"
-+fi
-+
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
+ else
+   STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -9091,6 +10258,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
 +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$SED" && SED=sed
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -9110,21 +10278,32 @@
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    ;;
-+  *)
+     ;;
+   *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+
+     ;;
+   esac
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
 +for cc_temp in $compiler""; do
 +  case $cc_temp in
 +    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
@@ -26520,195 +13988,173 @@
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +
 +
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $MAGIC_CMD in
-+[\\/*] |  ?:[\\/]*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/${ac_tool_prefix}file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9144,7 +10323,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
 +	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  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
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool at gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
+ 	  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
+@@ -9176,17 +10355,17 @@
+ 
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
 +  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
 +echo "${ECHO_T}$MAGIC_CMD" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
+ fi
+ 
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+   if test -n "$ac_tool_prefix"; then
+-    echo "$as_me:$LINENO: checking for file" >&5
+-echo $ECHO_N "checking for file... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for file" >&5
 +echo $ECHO_N "checking for file... $ECHO_C" >&6; }
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $MAGIC_CMD in
-+[\\/*] |  ?:[\\/]*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9206,7 +10385,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
 +	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  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
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool at gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
+ 	  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
+@@ -9238,11 +10417,11 @@
+ 
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
 +  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
 +echo "${ECHO_T}$MAGIC_CMD" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+
-+  fi
-+  ;;
-+esac
-+
-+enable_dlopen=yes
-+enable_win32_dll=no
-+
+ fi
+ 
+   else
+@@ -9257,21 +10436,21 @@
+ enable_dlopen=yes
+ enable_win32_dll=no
+ 
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
 +# Check whether --enable-libtool-lock was given.
-+if test "${enable_libtool_lock+set}" = set; then
+ if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
 +  enableval=$enable_libtool_lock;
 +fi
-+
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+
+ 
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+ 
+-# Check whether --with-pic or --without-pic was given.
 +# Check whether --with-pic was given.
-+if test "${with_pic+set}" = set; then
+ if test "${with_pic+set}" = set; then
+-  withval="$with_pic"
+-  pic_mode="$withval"
 +  withval=$with_pic; pic_mode="$withval"
-+else
-+  pic_mode=default
+ else
+   pic_mode=default
+-fi;
 +fi
 +
-+test -z "$pic_mode" && pic_mode=default
-+
-+# Use C for the default configuration in the libtool script
-+tagname=
-+lt_save_CC="$CC"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+objext=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}\n'
-+
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
+ test -z "$pic_mode" && pic_mode=default
+ 
+ # Use C for the default configuration in the libtool script
+@@ -9301,68 +10480,25 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 +
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ 
+ 
+-#
+-# Check for any special shared library compilation flags.
+-#
+-lt_prog_cc_shlib=
+-if test "$GCC" = no; then
+-  case $host_os in
+-  sco3.2v5*)
+-    lt_prog_cc_shlib='-belf'
+-    ;;
+-  esac
+-fi
+-if test -n "$lt_prog_cc_shlib"; then
+-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
+-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
+-  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
+-  else
+-    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
+-    lt_cv_prog_cc_can_build_shared=no
+-  fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
+-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_static_works+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_prog_compiler_static_works=no
+-   save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test -s conftest.err; then
+-       # Append any errors to the config.log.
+-       cat conftest.err 1>&5
+-     else
+-       lt_prog_compiler_static_works=yes
+-     fi
+-   fi
+-   $rm conftest*
+-   LDFLAGS="$save_LDFLAGS"
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+-
+-if test x"$lt_prog_compiler_static_works" = xyes; then
+-    :
+-else
+-    lt_prog_compiler_static=
+-fi
+-
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
@@ -26721,155 +14167,92 @@
 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
-+
-+
-+## 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
-+## what you are doing...
-+
-+lt_prog_compiler_no_builtin_flag=
-+
-+if test "$GCC" = yes; then
-+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-+
-+
+ 
+ 
+ ## CAVEAT EMPTOR:
+@@ -9376,8 +10512,8 @@
+   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+ 
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_prog_compiler_rtti_exceptions=no
-+  ac_outfile=conftest.$ac_objext
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="-fno-rtti -fno-exceptions"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # 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 \
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9391,26 +10527,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 \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9397: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:10533: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9401: \$? = $ac_status" >&5
 +   echo "$as_me:10537: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
+    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
+-     if test ! -s conftest.err; then
 +     # So say no if there are warnings other than the usual output.
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
 +     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_rtti_exceptions=yes
-+     fi
-+   fi
-+   $rm conftest*
-+
-+fi
+        lt_cv_prog_compiler_rtti_exceptions=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+
-+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"
-+else
-+    :
-+fi
-+
-+fi
-+
-+lt_prog_compiler_wl=
-+lt_prog_compiler_pic=
-+lt_prog_compiler_static=
-+
+ 
+ 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"
+@@ -9424,8 +10562,8 @@
+ lt_prog_compiler_pic=
+ lt_prog_compiler_static=
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-+
-+  if test "$GCC" = yes; then
-+    lt_prog_compiler_wl='-Wl,'
-+    lt_prog_compiler_static='-static'
-+
-+    case $host_os in
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static='-Bstatic'
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+
-+    mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_prog_compiler_pic='-DDLL_EXPORT'
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic='-fno-common'
-+      ;;
-+
+ 
+   if test "$GCC" = yes; then
+     lt_prog_compiler_wl='-Wl,'
+@@ -9463,6 +10601,11 @@
+       lt_prog_compiler_pic='-fno-common'
+       ;;
+ 
 +    interix3*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
 +
-+    msdosdjgpp*)
-+      # Just because we use GCC doesn't mean we suddenly get shared libraries
-+      # on systems that don't support them.
-+      lt_prog_compiler_can_build_shared=no
-+      enable_shared=no
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	lt_prog_compiler_pic=-Kconform_pic
-+      fi
-+      ;;
-+
-+    hpux*)
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -9479,7 +10622,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
 +      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	lt_prog_compiler_pic='-fPIC'
-+	;;
-+      esac
-+      ;;
-+
-+    *)
-+      lt_prog_compiler_pic='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
-+    aix*)
-+      lt_prog_compiler_wl='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static='-Bstatic'
-+      else
-+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -9505,6 +10648,16 @@
+ 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
 +      darwin*)
 +        # PIC is the default on this platform
 +        # Common symbols not allowed in MH_DYLIB files
@@ -26880,47 +14263,31 @@
 +         ;;
 +       esac
 +       ;;
-+
-+    mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_prog_compiler_pic='-DDLL_EXPORT'
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -9516,7 +10669,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.
+-      case "$host_cpu" in
 +      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	lt_prog_compiler_pic='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      lt_prog_compiler_static='${wl}-a ${wl}archive'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
-+
-+    newsos6)
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -9539,13 +10692,20 @@
+       lt_prog_compiler_static='-Bstatic'
+       ;;
+ 
+-    linux*)
+-      case $CC in
 +    linux* | k*bsd*-gnu)
 +      case $cc_basename in
-+      icc* | ecc*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-KPIC'
-+	lt_prog_compiler_static='-static'
-+        ;;
+       icc* | ecc*)
+ 	lt_prog_compiler_wl='-Wl,'
+ 	lt_prog_compiler_pic='-KPIC'
+ 	lt_prog_compiler_static='-static'
+         ;;
 +      pgcc* | pgf77* | pgf90* | pgf95*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
@@ -26928,50 +14295,44 @@
 +	lt_prog_compiler_pic='-fpic'
 +	lt_prog_compiler_static='-Bstatic'
 +        ;;
-+      ccc*)
-+        lt_prog_compiler_wl='-Wl,'
-+        # All Alpha code is PIC.
-+        lt_prog_compiler_static='-non_shared'
-+        ;;
-+      esac
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # All OSF/1 code is PIC.
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
-+
-+    solaris*)
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
+       ccc*)
+         lt_prog_compiler_wl='-Wl,'
+         # All Alpha code is PIC.
+@@ -9560,15 +10720,15 @@
+       lt_prog_compiler_static='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      lt_prog_compiler_pic='-Kpic'
+-      lt_prog_compiler_static='-dn'
+-      ;;
+-
+     solaris*)
+-      lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-KPIC'
+       lt_prog_compiler_static='-Bstatic'
 +      case $cc_basename in
 +      f77* | f90* | f95*)
 +	lt_prog_compiler_wl='-Qoption ld ';;
 +      *)
 +	lt_prog_compiler_wl='-Wl,';;
 +      esac
-+      ;;
-+
-+    sunos4*)
-+      lt_prog_compiler_wl='-Qoption ld '
-+      lt_prog_compiler_pic='-PIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
+       ;;
+ 
+     sunos4*)
+@@ -9577,7 +10737,7 @@
+       lt_prog_compiler_static='-Bstatic'
+       ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_prog_compiler_pic='-Kconform_pic'
-+	lt_prog_compiler_static='-Bstatic'
-+      fi
-+      ;;
-+
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-KPIC'
+       lt_prog_compiler_static='-Bstatic'
+@@ -9590,6 +10750,17 @@
+       fi
+       ;;
+ 
 +    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +      lt_prog_compiler_wl='-Wl,'
 +      lt_prog_compiler_pic='-KPIC'
@@ -26983,84 +14344,81 @@
 +      lt_prog_compiler_can_build_shared=no
 +      ;;
 +
-+    uts4*)
-+      lt_prog_compiler_pic='-pic'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    *)
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+    esac
-+  fi
-+
+     uts4*)
+       lt_prog_compiler_pic='-pic'
+       lt_prog_compiler_static='-Bstatic'
+@@ -9601,16 +10772,16 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic"; then
-+
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-+if test "${lt_prog_compiler_pic_works+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_prog_compiler_pic_works=no
-+  ac_outfile=conftest.$ac_objext
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # 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 \
+ if test "${lt_prog_compiler_pic_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9624,26 +10795,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 \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9630: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:10801: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9634: \$? = $ac_status" >&5
 +   echo "$as_me:10805: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
+    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
+-     if test ! -s conftest.err; then
 +     # So say no if there are warnings other than the usual output.
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
 +     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_prog_compiler_pic_works=yes
-+     fi
-+   fi
-+   $rm conftest*
-+
-+fi
+        lt_prog_compiler_pic_works=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
-+
-+if test x"$lt_prog_compiler_pic_works" = xyes; then
-+    case $lt_prog_compiler_pic in
-+     "" | " "*) ;;
-+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-+     esac
-+else
-+    lt_prog_compiler_pic=
-+     lt_prog_compiler_can_build_shared=no
-+fi
-+
-+fi
+ 
+ if test x"$lt_prog_compiler_pic_works" = xyes; then
+     case $lt_prog_compiler_pic in
+@@ -9656,7 +10829,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
 +case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic=
-+    ;;
-+  *)
-+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-+    ;;
-+esac
-+
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic=
+@@ -9666,8 +10839,50 @@
+     ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -27105,116 +14463,103 @@
 +
 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_prog_compiler_c_o=no
-+   $rm -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
+ if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9678,60 +10893,58 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9697: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:10905: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:9701: \$? = $ac_status" >&5
 +   echo "$as_me:10909: \$? = $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
-+     # So say no if there are warnings
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
 +     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
 +     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o=yes
-+     fi
-+   fi
+        lt_cv_prog_compiler_c_o=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
 +   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
 +   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
 +   $rm out/* && rmdir out
-+   cd ..
-+   rmdir conftest
-+   $rm conftest*
-+
-+fi
+    cd ..
+    rmdir conftest
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
-+
-+
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
+ 
+ 
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
 +  { echo "$as_me:$LINENO: result: $hard_links" >&5
 +echo "${ECHO_T}$hard_links" >&6; }
-+  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;}
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
+   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;}
+@@ -9741,8 +10954,8 @@
+   need_locks=no
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-+
-+  runpath_var=
-+  allow_undefined_flag=
-+  enable_shared_with_static_runtimes=no
-+  archive_cmds=
-+  archive_expsym_cmds=
-+  old_archive_From_new_cmds=
-+  old_archive_from_expsyms_cmds=
-+  export_dynamic_flag_spec=
-+  whole_archive_flag_spec=
-+  thread_safe_flag_spec=
-+  hardcode_libdir_flag_spec=
-+  hardcode_libdir_flag_spec_ld=
-+  hardcode_libdir_separator=
-+  hardcode_direct=no
-+  hardcode_minus_L=no
-+  hardcode_shlibpath_var=unsupported
-+  link_all_deplibs=unknown
-+  hardcode_automatic=no
-+  module_cmds=
-+  module_expsym_cmds=
-+  always_export_symbols=no
-+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  include_expsyms=
-+  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
-+  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+  # platforms (ab)use it in PIC code, but their linkers get confused if
-+  # the symbol is explicitly referenced.  Since portable code cannot
-+  # rely on this symbol name, it's probably fine to never include it in
-+  # preloaded symbol tables.
-+  extract_expsyms_cmds=
+ 
+   runpath_var=
+   allow_undefined_flag=
+@@ -9780,6 +10993,16 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
 +  # Just being paranoid about ensuring that cc_basename is set.
 +  for cc_temp in $compiler""; do
 +  case $cc_temp in
@@ -27225,30 +14570,24 @@
 +  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+@@ -9790,6 +11013,10 @@
+       with_gnu_ld=no
+     fi
+     ;;
 +  interix*)
 +    # we just hope/assume this is gcc and not c89 (= MSVC++)
 +    with_gnu_ld=yes
 +    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+  esac
-+
-+  ld_shlibs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
-+
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+@@ -9800,6 +11027,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
@@ -27270,68 +14609,40 @@
 +      *) supports_anon_versioning=yes ;;
 +    esac
 +
-+    # See if GNU ld supports shared libraries.
-+    case $host_os in
-+    aix3* | aix4* | aix5*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+	ld_shlibs=no
-+	cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+
-+      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
-+      # that the semantics of dynamic libraries on AmigaOS, at least up
-+      # to version 4, is to share data among multiple programs linked
-+      # with the same dynamic library.  Since this doesn't match the
-+      # behavior of shared libraries on other platforms, we can't use
-+      # them.
-+      ld_shlibs=no
-+      ;;
-+
-+    beos*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	allow_undefined_flag=unsupported
-+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -9837,7 +11085,7 @@
+ 	allow_undefined_flag=unsupported
+ 	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
 +	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-+    cygwin* | mingw* | pw32*)
-+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-+      # as there is no search path for DLLs.
-+      hardcode_libdir_flag_spec='-L$libdir'
+       else
+ 	ld_shlibs=no
+       fi
+@@ -9847,13 +11095,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'
+-      allow_undefined_flag=no
 +      allow_undefined_flag=unsupported
-+      always_export_symbols=no
-+      enable_shared_with_static_runtimes=yes
+       always_export_symbols=no
+       enable_shared_with_static_runtimes=yes
+-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 +      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+
-+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 +        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# 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
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
+ 	# 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
+@@ -9862,23 +11110,70 @@
+ 	  echo EXPORTS > $output_objdir/$soname.def;
+ 	  cat $export_symbols >> $output_objdir/$soname.def;
+ 	fi~
+-	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +      else
 +	ld_shlibs=no
@@ -27380,42 +14691,42 @@
 +	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 +	fi
 +	link_all_deplibs=no
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    solaris* | sysv5*)
 +    solaris*)
-+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+	ld_shlibs=no
-+	cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs=no
+ 	cat <<EOF 1>&2
+@@ -9892,13 +11187,40 @@
+ 
+ EOF
+       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
 +    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 +      case `$LD -v 2>&1` in
 +        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
@@ -27443,62 +14754,55 @@
 +      esac
 +      ;;
 +
-+    sunos4*)
-+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    *)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+     sunos4*)
+       archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+@@ -9908,24 +11230,19 @@
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+    esac
-+
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec=
+-      fi
 +    if test "$ld_shlibs" = no; then
 +      runpath_var=
 +      hardcode_libdir_flag_spec=
 +      export_dynamic_flag_spec=
 +      whole_archive_flag_spec=
-+    fi
-+  else
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      allow_undefined_flag=unsupported
-+      always_export_symbols=yes
-+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      hardcode_minus_L=yes
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -9937,7 +11254,7 @@
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       hardcode_minus_L=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
 +      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	hardcode_direct=unsupported
-+      fi
-+      ;;
-+
-+    aix4* | aix5*)
-+      if test "$host_cpu" = ia64; then
-+	# On IA64, the linker does run time linking by default, so we don't
-+	# have to do anything special.
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	hardcode_direct=unsupported
+@@ -9959,9 +11276,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
 +	aix_use_runtimelinking=no
-+	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
-+      else
-+	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+	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
-+	aix_use_runtimelinking=no
 +
 +	# Test if we are trying to use run time linking or normal
 +	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -27512,87 +14816,71 @@
 +	  done
 +	  ;;
 +	esac
-+
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
-+
-+      # When large executables or shared objects are built, AIX ld can
-+      # have problems creating the table of contents.  If linking a library
-+      # or program results in "error TOC overflow" add -mminimal-toc to
-+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+      archive_cmds=''
-+      hardcode_direct=yes
-+      hardcode_libdir_separator=':'
-+      link_all_deplibs=yes
-+
-+      if test "$GCC" = yes; then
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+@@ -9978,7 +11307,7 @@
+       link_all_deplibs=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.012|aix4.012.*)
 +	case $host_os in aix4.[012]|aix4.[012].*)
-+	# 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`
-+	  if test -f "$collect2name" && \
-+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	  then
-+  	  # We have reworked collect2
-+  	  hardcode_direct=yes
-+	  else
-+  	  # We have old collect2
-+  	  hardcode_direct=unsupported
-+  	  # It fails to find uninstalled libraries when the uninstalled
-+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+  	  # to unsupported forces relinking
-+  	  hardcode_minus_L=yes
-+  	  hardcode_libdir_flag_spec='-L$libdir'
-+  	  hardcode_libdir_separator=
-+	  fi
+ 	# 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`
+@@ -9997,8 +11326,12 @@
+   	  hardcode_libdir_flag_spec='-L$libdir'
+   	  hardcode_libdir_separator=
+ 	  fi
 +	  ;;
-+	esac
-+	shared_flag='-shared'
+ 	esac
+ 	shared_flag='-shared'
 +	if test "$aix_use_runtimelinking" = yes; then
 +	  shared_flag="$shared_flag "'${wl}-G'
 +	fi
-+      else
-+	# not using gcc
-+	if test "$host_cpu" = ia64; then
-+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+  	# chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+	else
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -10006,22 +11339,23 @@
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
 +	  if test "$aix_use_runtimelinking" = yes; then
 +	    shared_flag='${wl}-G'
-+	  else
+ 	  else
+-	    shared_flag='-qmkshrobj'
+-  	fi
 +	    shared_flag='${wl}-bM:SRE'
 +	  fi
-+	fi
-+      fi
-+
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      always_export_symbols=no
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      always_export_symbols=yes
-+      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.
-+	allow_undefined_flag='-berok'
-+       # Determine the default libpath from the value encoded in an empty executable.
+       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.
+ 	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
 +       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 conftest$ac_exeext
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -10037,27 +11371,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -27600,58 +14888,65 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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; }
+ }'`
+@@ -10068,19 +11398,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 +	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+       else
-+	if test "$host_cpu" = ia64; then
-+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	  allow_undefined_flag="-z nodefs"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ 	  allow_undefined_flag="-z nodefs"
+-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
 +	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+	else
-+	 # Determine the default libpath from the value encoded in an empty executable.
-+	 cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 cat >conftest.$ac_ext <<_ACEOF
+@@ -10099,27 +11430,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -27659,81 +14954,112 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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; }
+ }'`
+@@ -10130,8 +11457,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	  # Warning - without using the other run time loading flags,
-+	  # -berok will link without error, but may produce a broken library.
-+	  no_undefined_flag=' ${wl}-bernotok'
-+	  allow_undefined_flag=' ${wl}-berok'
-+	  # Exported symbols can be pulled into shared objects from archives
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -10140,13 +11469,11 @@
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  no_undefined_flag=' ${wl}-bernotok'
+ 	  allow_undefined_flag=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  always_export_symbols=yes
+ 	  # Exported symbols can be pulled into shared objects from archives
+-	  whole_archive_flag_spec=' '
 +	  whole_archive_flag_spec='$convenience'
-+	  archive_cmds_need_lc=yes
+ 	  archive_cmds_need_lc=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	fi
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      # see comment about different semantics on the GNU ld section
-+      ld_shlibs=no
-+      ;;
-+
+ 	fi
+       fi
+       ;;
+@@ -10159,7 +11486,7 @@
+       ld_shlibs=no
+       ;;
+ 
+-    bsdi4*)
 +    bsdi[45]*)
-+      export_dynamic_flag_spec=-rdynamic
-+      ;;
-+
-+    cygwin* | mingw* | pw32*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      hardcode_libdir_flag_spec=' '
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+@@ -10169,13 +11496,13 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       hardcode_libdir_flag_spec=' '
+-      allow_undefined_flag=no
 +      allow_undefined_flag=unsupported
-+      # Tell ltmain to make .lib files, not .a files.
-+      libext=lib
-+      # Tell ltmain to make .dll files, not .so files.
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
 +      shrext_cmds=".dll"
-+      # FIXME: Setting linknames here is a bad hack.
+       # FIXME: Setting linknames here is a bad hack.
+-      archive_cmds='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
 +      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # 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.
-+      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      enable_shared_with_static_runtimes=yes
-+      ;;
-+
-+    darwin* | rhapsody*)
+       # 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.
+@@ -10185,52 +11512,52 @@
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
+-	allow_undefined_flag='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.012)
+-	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
 +      case $host_os in
 +        rhapsody* | darwin1.[012])
 +         allow_undefined_flag='${wl}-undefined ${wl}suppress'
@@ -27752,13 +15078,32 @@
 +           esac
 +         fi
 +         ;;
-+      esac
+       esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-      fi
+-      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +      archive_cmds_need_lc=no
-+      hardcode_direct=no
-+      hardcode_automatic=yes
-+      hardcode_shlibpath_var=unsupported
+       hardcode_direct=no
+       hardcode_automatic=yes
+       hardcode_shlibpath_var=unsupported
+-      whole_archive_flag_spec='-all_load $convenience'
 +      whole_archive_flag_spec=''
-+      link_all_deplibs=yes
+       link_all_deplibs=yes
 +    if test "$GCC" = yes ; then
 +    	output_verbose_link_cmd='echo'
 +        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
@@ -27766,7 +15111,8 @@
 +      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 +      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    else
+     else
+-      ld_shlibs=no
 +      case $cc_basename in
 +        xlc*)
 +         output_verbose_link_cmd='echo'
@@ -27780,64 +15126,39 @@
 +         ld_shlibs=no
 +          ;;
 +      esac
-+    fi
-+      ;;
-+
-+    dgux*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    freebsd1*)
-+      ld_shlibs=no
-+      ;;
-+
-+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+    # support.  Future versions do this automatically, but an explicit c++rt0.o
-+    # does not break anything, and helps significantly (at the cost of a little
-+    # extra space).
-+    freebsd2.2*)
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+     fi
+       ;;
+ 
+@@ -10264,8 +11591,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
 +    freebsd* | dragonfly*)
 +      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
+       hardcode_libdir_flag_spec='-R$libdir'
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
+@@ -10273,7 +11600,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 +	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      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
-+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_direct=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      hardcode_minus_L=yes
-+      export_dynamic_flag_spec='${wl}-E'
-+      ;;
-+
+       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
+@@ -10287,47 +11614,62 @@
+       export_dynamic_flag_spec='${wl}-E'
+       ;;
+ 
+-    hpux10* | hpux11*)
 +    hpux10*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -27863,153 +15184,160 @@
 +	  ;;
 +	ia64*)
 +	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
+ 	  ;;
+ 	*)
+-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
 +	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      else
+ 	  ;;
+ 	esac
+       else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	case $host_cpu in
 +	hppa*64*)
 +	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
 +	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
+ 	  ;;
+ 	*)
+-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 +	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      fi
-+      if test "$with_gnu_ld" = no; then
+ 	  ;;
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_separator=:
 +
 +	case $host_cpu in
 +	hppa*64*|ia64*)
-+	  hardcode_libdir_flag_spec_ld='+b $libdir'
-+	  hardcode_direct=no
-+	  hardcode_shlibpath_var=no
-+	  ;;
-+	*)
-+	  hardcode_direct=yes
-+	  export_dynamic_flag_spec='${wl}-E'
-+
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  hardcode_minus_L=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
+ 	  hardcode_libdir_flag_spec_ld='+b $libdir'
+-	  hardcode_libdir_separator=:
+ 	  hardcode_direct=no
+ 	  hardcode_shlibpath_var=no
+ 	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec='-L$libdir'
+-	  hardcode_direct=no
+-	  hardcode_shlibpath_var=no
+-
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L=yes
+-	  ;;
+ 	*)
+-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_separator=:
+ 	  hardcode_direct=yes
+ 	  export_dynamic_flag_spec='${wl}-E'
+ 
+@@ -10341,7 +11683,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      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'
-+      fi
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      link_all_deplibs=yes
-+      ;;
-+
+       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'
+@@ -10351,7 +11693,7 @@
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    newsos6)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    openbsd*)
-+      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
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -10374,7 +11716,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
+-	archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	export_dynamic_flag_spec='${wl}-E'
-+      else
-+       case $host_os in
-+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	   hardcode_libdir_flag_spec='-R$libdir'
-+	   ;;
-+	 *)
+ 	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ 	export_dynamic_flag_spec='${wl}-E'
+       else
+@@ -10384,7 +11727,7 @@
+ 	   hardcode_libdir_flag_spec='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	   ;;
-+       esac
-+      fi
-+      ;;
-+
-+    os2*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      allow_undefined_flag=unsupported
+ 	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -10395,14 +11738,14 @@
+       hardcode_libdir_flag_spec='-L$libdir'
+       hardcode_minus_L=yes
+       allow_undefined_flag=unsupported
+-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
 +      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
-+
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+       old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      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'
-+      fi
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+       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'
+@@ -10414,13 +11757,13 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      else
-+	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+ 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+       else
+ 	allow_undefined_flag=' -expect_unresolved \*'
+ 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
 +	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+	# Both c and cxx compiler support -rpath directly
-+	hardcode_libdir_flag_spec='-rpath $libdir'
-+      fi
-+      hardcode_libdir_separator=:
-+      ;;
-+
-+    solaris*)
-+      no_undefined_flag=' -z text'
-+      if test "$GCC" = yes; then
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	hardcode_libdir_flag_spec='-rpath $libdir'
+@@ -10428,21 +11771,15 @@
+       hardcode_libdir_separator=:
+       ;;
+ 
+-    sco3.2v5*)
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var=no
+-      export_dynamic_flag_spec='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+-
+     solaris*)
+       no_undefined_flag=' -z text'
+       if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	wlarc='${wl}'
 +	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-+      else
+       else
 +	wlarc=''
-+	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'
-+      fi
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_shlibpath_var=no
-+      case $host_os in
-+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+ 	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'
+@@ -10451,8 +11788,18 @@
+       hardcode_shlibpath_var=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
 +      *)
 + 	# The compiler driver will combine linker options so we
 + 	# cannot just pass the convience library names through
@@ -28022,77 +15350,58 @@
 + 	*)
 + 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
 + 	esac ;;
-+      esac
-+      link_all_deplibs=yes
-+      ;;
-+
-+    sunos4*)
-+      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.
+       esac
+       link_all_deplibs=yes
+       ;;
+@@ -10461,7 +11808,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.
+-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  reload_cmds='$CC -r -o $output$reload_objs'
-+	  hardcode_direct=no
-+        ;;
-+	motorola)
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    sysv4.3*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      export_dynamic_flag_spec='-Bexport'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_shlibpath_var=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	ld_shlibs=yes
-+      fi
-+      ;;
-+
+       else
+ 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -10509,36 +11856,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct=yes
+-      hardcode_minus_L=no
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
 +      no_undefined_flag='${wl}-z,text'
 +      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
+       hardcode_shlibpath_var=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
 +      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
+       else
+-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
+       fi
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var=no
+       ;;
+ 
+-    sysv5*)
+-      no_undefined_flag=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      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'
+-      hardcode_libdir_flag_spec=
 +    sysv5* | sco3.2v5* | sco5v6*)
 +      # Note: We can NOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
@@ -28103,12 +15412,12 @@
 +      no_undefined_flag='${wl}-z,text'
 +      allow_undefined_flag='${wl}-z,nodefs'
 +      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
+       hardcode_shlibpath_var=no
 +      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
 +      hardcode_libdir_separator=':'
 +      link_all_deplibs=yes
 +      export_dynamic_flag_spec='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
+       runpath_var='LD_RUN_PATH'
 +
 +      if test "$GCC" = yes; then
 +	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -28117,102 +15426,77 @@
 +	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
-+      ;;
-+
-+    uts4*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    *)
-+      ld_shlibs=no
-+      ;;
-+    esac
-+  fi
-+
+       ;;
+ 
+     uts4*)
+@@ -10553,15 +11909,10 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+-echo "${ECHO_T}$ld_shlibs" >&6
 +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
 +echo "${ECHO_T}$ld_shlibs" >&6; }
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc" in
-+x|xyes)
-+  # Assume -lc should be added
-+  archive_cmds_need_lc=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $archive_cmds in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-+      ;;
-+    '$CC '*)
-+      # 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.
+ test "$ld_shlibs" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -10579,8 +11930,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.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
 +      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-+      $rm conftest*
-+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+@@ -10594,6 +11945,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl
 +	pic_flag=$lt_prog_compiler_pic
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag
-+        allow_undefined_flag=
-+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+        then
-+	  archive_cmds_need_lc=no
-+        else
-+	  archive_cmds_need_lc=yes
-+        fi
-+        allow_undefined_flag=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $rm conftest*
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -10616,20 +11968,20 @@
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc" >&6
 +      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
 +echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
-+
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
 +shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -10639,7 +11991,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +if test "$GCC" = yes; then
 +  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 +  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
@@ -28227,184 +15511,82 @@
 +else
 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[01] | aix4.[01].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-+      ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -10704,7 +12069,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
 +  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
+   ;;
+ 
+ beos*)
+@@ -10713,7 +12078,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
 +bsdi[45]*)
-+  version_type=linux
-+  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 $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10729,7 +12094,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
 +  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
-+
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -10741,7 +12106,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
 +      $install_prog $dir/$dlname \$dldir/$dlname~
 +      chmod a+x \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-+    mingw*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -10771,7 +12137,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
 +      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    esac
-+    ;;
-+
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
+       ;;
+     esac
+     ;;
+@@ -10794,7 +12160,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+  if test "$GCC" = yes; then
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+  else
-+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
-+
-+dgux*)
-+  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
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
+   # 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"`
+@@ -10817,20 +12183,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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='GNU ld.so'
+-  ;;
+-
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
@@ -28416,95 +15598,65 @@
 +    *) objformat=elf ;;
 +    esac
 +  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -10848,14 +12211,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
 +  freebsd3.[01]* | freebsdelf3.[01]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
 +  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
 +  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
 +  freebsd*) # from 4.6 on
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
-+  esac
-+  ;;
-+
-+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
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
+   esac
+   ;;
+ 
+@@ -10875,9 +12243,9 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  case "$host_cpu" in
 +  case $host_cpu in
-+  ia64*)
+   ia64*)
+-    shrext='.so'
 +    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+   hppa*64*)
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -10892,7 +12260,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
 +     shrext_cmds='.sl'
-+     hardcode_into_libs=yes
-+     dynamic_linker="$host_os dld.sl"
-+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+     soname_spec='${libname}${release}${shared_ext}$major'
-+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+     ;;
-+   *)
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -10903,7 +12271,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
 +    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    ;;
-+  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -10915,6 +12283,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
 +interix3*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -28517,78 +15669,50 @@
 +  hardcode_into_libs=yes
 +  ;;
 +
-+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.
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -10958,29 +12338,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'
-+  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
-+
+   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'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+   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
+ 
 +  # 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,
-+  # 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'
-+  ;;
-+
+   # 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,
+@@ -10990,6 +12367,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -28601,145 +15725,69 @@
 +  dynamic_linker='NetBSD ld.elf_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
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -10999,7 +12388,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}'
 +    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
-+  ;;
-+
-+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
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -11027,8 +12416,13 @@
+ 
+ openbsd*)
+   version_type=sunos
 +  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
+   need_lib_prefix=no
+-  need_version=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
-+  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'
+   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
+@@ -11048,7 +12442,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
 +  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*)
-+  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"
-+  ;;
-+
-+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'
-+  ;;
-+
-+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
-+  ;;
-+
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -11066,13 +12460,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  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
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -11098,7 +12485,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +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
-+  ;;
-+
-+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
-+  ;;
-+
+   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'
+@@ -11131,6 +12518,29 @@
+   fi
+   ;;
+ 
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -28763,21 +15811,21 @@
 +  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
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -11142,16 +12552,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 +echo "${ECHO_T}$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
-+
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
+-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
 +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"
@@ -28785,127 +15833,103 @@
 +
 +{ 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=
-+if test -n "$hardcode_libdir_flag_spec" || \
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" || \
+-   test -n "$runpath_var " || \
+-   test "X$hardcode_automatic"="Xyes" ; then
 +   test -n "$runpath_var" || \
 +   test "X$hardcode_automatic" = "Xyes" ; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct" != no &&
+@@ -11171,8 +12586,8 @@
+   # directories.
+   hardcode_action=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action" >&5
+-echo "${ECHO_T}$hardcode_action" >&6
 +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
 +echo "${ECHO_T}$hardcode_action" >&6; }
-+
-+if test "$hardcode_action" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+striplib=
-+old_striplib=
+ 
+ if test "$hardcode_action" = relink; then
+   # Fast installation is not supported
+@@ -11185,29 +12600,29 @@
+ 
+ striplib=
+ old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
-+   darwin*)
-+       if test -n "$STRIP" ; then
-+         striplib="$STRIP -x"
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+   case $host_os in
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
+-         echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +         { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+       else
+        else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+       ;;
-+   *)
+ fi
+        ;;
+    *)
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+    ;;
-+  esac
-+fi
-+
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  darwin*)
-+  # if libdl is installed we need to link against it
+     ;;
+   esac
+ fi
+@@ -11239,8 +12654,8 @@
+ 
+   darwin*)
+   # if libdl is installed we need to link against it
+-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11253,56 +12668,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
+ #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 dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
 +return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -28913,94 +15937,102 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_dl_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dl_dlopen=no
 +	ac_cv_lib_dl_dlopen=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+
-+fi
-+
-+   ;;
-+
-+  *)
+ if test $ac_cv_lib_dl_dlopen = yes; then
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+@@ -11316,8 +12728,8 @@
+    ;;
+ 
+   *)
+-    echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for shl_load" >&5
 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-+if test "${ac_cv_func_shl_load+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define shl_load innocuous_shl_load
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char shl_load (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef shl_load
-+
+ if test "${ac_cv_func_shl_load+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11344,73 +12756,64 @@
+ 
+ #undef shl_load
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shl_load ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 shl_load ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
 +#if defined __stub_shl_load || defined __stub___shl_load
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != shl_load;
 +return shl_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -29008,62 +16040,83 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_func_shl_load=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_shl_load=no
 +	ac_cv_func_shl_load=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-+if test $ac_cv_func_shl_load = yes; then
-+  lt_cv_dlopen="shl_load"
-+else
+ if test $ac_cv_func_shl_load = yes; then
+   lt_cv_dlopen="shl_load"
+ else
+-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11423,61 +12826,58 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shl_load ();
-+int
-+main ()
-+{
+ #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 shl_load ();
+ int
+ main ()
+ {
+-shl_load ();
 +return shl_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -29071,84 +16124,98 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_dld_shl_load=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dld_shl_load=no
 +	ac_cv_lib_dld_shl_load=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-+if test $ac_cv_lib_dld_shl_load = yes; then
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+else
+ if test $ac_cv_lib_dld_shl_load = yes; then
+   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+ else
+-  echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for dlopen" >&5
 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-+if test "${ac_cv_func_dlopen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define dlopen innocuous_dlopen
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char dlopen (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef dlopen
-+
+ if test "${ac_cv_func_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11504,73 +12904,64 @@
+ 
+ #undef dlopen
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 dlopen ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
 +#if defined __stub_dlopen || defined __stub___dlopen
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != dlopen;
 +return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -29156,62 +16223,83 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_func_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_dlopen=no
 +	ac_cv_func_dlopen=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-+if test $ac_cv_func_dlopen = yes; then
-+  lt_cv_dlopen="dlopen"
-+else
+ if test $ac_cv_func_dlopen = yes; then
+   lt_cv_dlopen="dlopen"
+ else
+-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11583,61 +12974,58 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
+ #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 dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
 +return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -29219,63 +16307,84 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_dl_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dl_dlopen=no
 +	ac_cv_lib_dl_dlopen=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
+ if test $ac_cv_lib_dl_dlopen = yes; then
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11650,61 +13038,58 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
+ #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 dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
 +return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -29283,63 +16392,84 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_svld_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_svld_dlopen=no
 +	ac_cv_lib_svld_dlopen=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-+if test $ac_cv_lib_svld_dlopen = yes; then
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
+ if test $ac_cv_lib_svld_dlopen = yes; then
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11717,56 +13102,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dld_link ();
-+int
-+main ()
-+{
+ #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 dld_link ();
+ int
+ main ()
+ {
+-dld_link ();
 +return dld_link ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -29347,932 +16477,419 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_dld_dld_link=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dld_dld_link=no
 +	ac_cv_lib_dld_dld_link=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-+if test $ac_cv_lib_dld_dld_link = yes; then
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
+ if test $ac_cv_lib_dld_dld_link = yes; then
+   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ fi
+@@ -11801,13 +13183,13 @@
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 +    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
+ 
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
-+if test "${lt_cv_dlopen_self+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self=cross
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
+ if test "${lt_cv_dlopen_self+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11817,7 +13199,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11820 "configure"
 +#line 13202 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    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
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11874,6 +13256,8 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
 +  else
 +    puts (dlerror ());
-+
-+    exit (status);
-+}
-+EOF
-+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ 
+     exit (status);
+ }
+@@ -11883,12 +13267,12 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
 +    (./conftest; exit; ) >&5 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+       x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
 +      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self=no
-+  fi
-+fi
-+rm -fr conftest*
-+
-+
-+fi
+     esac
+   else :
+     # compilation failed
+@@ -11899,13 +13283,13 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
 +      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
 +      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
-+if test "${lt_cv_dlopen_self_static+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self_static=cross
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
+ if test "${lt_cv_dlopen_self_static+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11915,7 +13299,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11918 "configure"
 +#line 13302 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    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
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11972,6 +13356,8 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
 +  else
 +    puts (dlerror ());
-+
-+    exit (status);
-+}
-+EOF
-+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ 
+     exit (status);
+ }
+@@ -11981,12 +13367,12 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
 +    (./conftest; exit; ) >&5 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+       x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
 +      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self_static=no
-+  fi
-+fi
-+rm -fr conftest*
-+
-+
-+fi
+     esac
+   else :
+     # compilation failed
+@@ -11997,8 +13383,8 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 +{ 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
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+
-+
+     fi
+ 
+     CPPFLAGS="$save_CPPFLAGS"
+@@ -12019,19 +13405,19 @@
+ fi
+ 
+ 
+-# Report which librarie types wil actually be built
+-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
 +# Report which library types will actually be built
 +{ 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
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
+ test "$can_build_shared" = "no" && enable_shared=no
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
 +case $host_os in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -12040,58 +13426,21 @@
+   fi
+   ;;
+ 
+-aix4*)
 +aix4* | aix5*)
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-+    ;;
-+esac
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+-  ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    archive_cmds_need_lc=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
+-      allow_undefined_flag='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.012)
+-	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
+-    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    hardcode_direct=no
+-    hardcode_automatic=yes
+-    hardcode_shlibpath_var=unsupported
+-    whole_archive_flag_spec='-all_load $convenience'
+-    link_all_deplibs=yes
+-  else
+-    ld_shlibs=no
+-  fi
+     ;;
+ esac
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5
 +echo "${ECHO_T}$enable_shared" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
 +{ echo "$as_me:$LINENO: result: $enable_static" >&5
 +echo "${ECHO_T}$enable_static" >&6; }
-+
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  # See if we are running on zsh, and set the options which allow our commands through
-+  # without removal of \ escapes.
-+  if test -n "${ZSH_VERSION+set}" ; then
-+    setopt NO_GLOB_SUBST
-+  fi
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
+ 
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -12106,7 +13455,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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
 +  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
 +    SED SHELL STRIP \
-+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+    deplibs_check_method reload_flag reload_cmds need_locks \
-+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+    lt_cv_sys_global_symbol_to_c_name_address \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    old_postinstall_cmds old_postuninstall_cmds \
-+    compiler \
-+    CC \
-+    LD \
-+    lt_prog_compiler_wl \
-+    lt_prog_compiler_pic \
-+    lt_prog_compiler_static \
-+    lt_prog_compiler_no_builtin_flag \
-+    export_dynamic_flag_spec \
-+    thread_safe_flag_spec \
-+    whole_archive_flag_spec \
-+    enable_shared_with_static_runtimes \
-+    old_archive_cmds \
-+    old_archive_from_new_cmds \
-+    predep_objects \
-+    postdep_objects \
-+    predeps \
-+    postdeps \
-+    compiler_lib_search_path \
-+    archive_cmds \
-+    archive_expsym_cmds \
-+    postinstall_cmds \
-+    postuninstall_cmds \
-+    old_archive_from_expsyms_cmds \
-+    allow_undefined_flag \
-+    no_undefined_flag \
-+    export_symbols_cmds \
-+    hardcode_libdir_flag_spec \
-+    hardcode_libdir_flag_spec_ld \
-+    hardcode_libdir_separator \
-+    hardcode_automatic \
-+    module_cmds \
-+    module_expsym_cmds \
-+    lt_cv_prog_compiler_c_o \
-+    exclude_expsyms \
-+    include_expsyms; do
-+
-+    case $var in
-+    old_archive_cmds | \
-+    old_archive_from_new_cmds | \
-+    archive_cmds | \
-+    archive_expsym_cmds | \
-+    module_cmds | \
-+    module_expsym_cmds | \
-+    old_archive_from_expsyms_cmds | \
-+    export_symbols_cmds | \
-+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  case $lt_echo in
-+  *'\$0 --fallback-echo"')
-+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+    ;;
-+  esac
-+
-+cfgfile="${ofile}T"
-+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-+  $rm -f "$cfgfile"
-+  { echo "$as_me:$LINENO: creating $ofile" >&5
-+echo "$as_me: creating $ofile" >&6;}
-+
-+  cat <<__EOF__ >> "$cfgfile"
-+#! $SHELL
-+
-+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Libtool:
-+# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# A sed program that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+     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 \
+@@ -12220,11 +13570,11 @@
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
 +Xsed="$SED -e 1s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+# The names of the tagged configurations supported by this script.
-+available_tags=
-+
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -12254,6 +13604,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
 +host_os=$host_os
 +
 +# The build system.
 +build_alias=$build_alias
 +build=$build
 +build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -12265,6 +13621,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
 +# LTCC compiler flags.
 +LTCFLAGS=$lt_LTCFLAGS
 +
-+# A language-specific compiler.
-+CC=$lt_compiler
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_LD
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
+ # A language-specific compiler.
+ CC=$lt_compiler
+ 
+@@ -12284,7 +13643,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
 +STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -12315,7 +13674,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
 +shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-+
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -12330,7 +13689,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+ 
+-# Must we lock files when doing compilation ?
 +# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds
-+module_expsym_cmds=$lt_module_expsym_cmds
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
-+
-+# ### END LIBTOOL CONFIG
-+
-+__EOF__
-+
-+
-+  case $host_os in
-+  aix3*)
-+    cat <<\EOF >> "$cfgfile"
-+
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+EOF
-+    ;;
-+  esac
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-+
-+  mv -f "$cfgfile" "$ofile" || \
-+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+  chmod +x "$ofile"
-+
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -12557,7 +13916,10 @@
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+-  test -f Makefile && make "$ltmain"
 +  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
 +  if test -f "$ltmain_in"; then
 +    test -f Makefile && make "$ltmain"
 +  fi
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC="$lt_save_CC"
-+
-+
+ fi
+ 
+ 
+@@ -12570,11 +13932,11 @@
+ CC="$lt_save_CC"
+ 
+ 
+-# Check whether --with-tags or --without-tags was given.
 +# Check whether --with-tags was given.
-+if test "${with_tags+set}" = set; then
+ if test "${with_tags+set}" = set; then
+-  withval="$with_tags"
+-  tagnames="$withval"
+-fi;
 +  withval=$with_tags; tagnames="$withval"
 +fi
 +
-+
-+if test -f "$ltmain" && test -n "$tagnames"; then
-+  if test ! -f "${ofile}"; then
-+    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-+  fi
-+
-+  if test -z "$LTCC"; then
-+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-+    if test -z "$LTCC"; then
-+      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-+    else
-+      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-+    fi
-+  fi
+ 
+ if test -f "$ltmain" && test -n "$tagnames"; then
+   if test ! -f "${ofile}"; then
+@@ -12592,6 +13954,9 @@
+ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+     fi
+   fi
 +  if test -z "$LTCFLAGS"; then
 +    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
 +  fi
-+
-+  # Extract list of available tagged configurations in $ofile.
-+  # Note that this assumes the entire list is on one line.
-+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-+
-+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+  for tagname in $tagnames; do
-+    IFS="$lt_save_ifs"
-+    # Check whether tagname contains only valid characters
-+    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-+    "") ;;
-+    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-+echo "$as_me: error: invalid tag name: $tagname" >&2;}
-+   { (exit 1); exit 1; }; }
-+	;;
-+    esac
-+
-+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-+    then
-+      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+
-+    # Update the list of available tags.
-+    if test -n "$tagname"; then
-+      echo appending configuration tag \"$tagname\" to $ofile
-+
-+      case $tagname in
-+      CXX)
+ 
+   # Extract list of available tagged configurations in $ofile.
+   # Note that this assumes the entire list is on one line.
+@@ -12622,8 +13987,10 @@
+ 
+       case $tagname in
+       CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+-	  ac_ext=cc
 +	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 +	    (test "X$CXX" != "Xg++"))) ; then
 +	  ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+
-+
-+archive_cmds_need_lc_CXX=no
-+allow_undefined_flag_CXX=
-+always_export_symbols_CXX=no
-+archive_expsym_cmds_CXX=
-+export_dynamic_flag_spec_CXX=
-+hardcode_direct_CXX=no
-+hardcode_libdir_flag_spec_CXX=
-+hardcode_libdir_flag_spec_ld_CXX=
-+hardcode_libdir_separator_CXX=
-+hardcode_minus_L_CXX=no
+ 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'
+@@ -12642,6 +14009,7 @@
+ hardcode_libdir_flag_spec_ld_CXX=
+ hardcode_libdir_separator_CXX=
+ hardcode_minus_L_CXX=no
 +hardcode_shlibpath_var_CXX=unsupported
-+hardcode_automatic_CXX=no
-+module_cmds_CXX=
-+module_expsym_cmds_CXX=
-+link_all_deplibs_CXX=unknown
-+old_archive_cmds_CXX=$old_archive_cmds
-+no_undefined_flag_CXX=
-+whole_archive_flag_spec_CXX=
-+enable_shared_with_static_runtimes_CXX=no
-+
-+# Dependencies to place before and after the object being linked:
-+predep_objects_CXX=
-+postdep_objects_CXX=
-+predeps_CXX=
-+postdeps_CXX=
-+compiler_lib_search_path_CXX=
-+
-+# Source file extension for C++ test sources.
+ hardcode_automatic_CXX=no
+ module_cmds_CXX=
+ module_expsym_cmds_CXX=
+@@ -12659,7 +14027,7 @@
+ compiler_lib_search_path_CXX=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
 +ac_ext=cpp
-+
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+objext_CXX=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
-+# Code to be used in simple link tests
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -12669,17 +14037,34 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
 +lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 +
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ 
+ 
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
@@ -30287,27 +16904,27 @@
 +$rm conftest*
 +
 +
-+# Allow CC to be a program name with arguments.
-+lt_save_CC=$CC
-+lt_save_LD=$LD
-+lt_save_GCC=$GCC
-+GCC=$GXX
-+lt_save_with_gnu_ld=$with_gnu_ld
-+lt_save_path_LD=$lt_cv_path_LD
-+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-+else
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -12690,18 +14075,27 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+-  unset lt_cv_prog_gnu_ld
 +  $as_unset lt_cv_prog_gnu_ld
-+fi
-+if test -n "${lt_cv_path_LDCXX+set}"; then
-+  lt_cv_path_LD=$lt_cv_path_LDCXX
-+else
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+   lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+-  unset lt_cv_path_LD
 +  $as_unset lt_cv_path_LD
-+fi
-+test -z "${LDCXX+set}" || LD=$LDCXX
-+CC=${CXX-"c++"}
-+compiler=$CC
-+compiler_CXX=$CC
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ compiler=$CC
+ compiler_CXX=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
 +for cc_temp in $compiler""; do
 +  case $cc_temp in
 +    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
@@ -30318,188 +16935,137 @@
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +
-+
-+# We don't want -fno-exception wen compiling C++ code, so set the
-+# no_builtin_flag separately
-+if test "$GXX" = yes; then
-+  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-+else
-+  lt_prog_compiler_no_builtin_flag_CXX=
-+fi
-+
-+if test "$GXX" = yes; then
-+  # Set up default GNU C++ configuration
-+
-+
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -12715,18 +14109,18 @@
+   # Set up default GNU C++ configuration
+ 
+ 
+-# 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
+ if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
 +  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-+else
-+  with_gnu_ld=no
+ else
+   with_gnu_ld=no
+-fi;
 +fi
 +
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [\\/]* | ?:[\\/]*)
-+      re_direlt='/[^/][^/]*/\.\./'
-+      # Canonicalize the pathname of ld
-+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
+   case $host in
+   *-*-mingw*)
+     # gcc leaves a trailing carriage return which upsets mingw
+@@ -12755,11 +14149,11 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for GNU ld" >&5
 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
-+fi
-+if test "${lt_cv_path_LD+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    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,
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12772,7 +14166,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,
+-      # but apparently some GNU ld's only accept -v.
 +      # but apparently some variants of GNU ld only accept -v.
-+      # 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'*)
-+	test "$with_gnu_ld" != no && break
-+	;;
-+      *)
-+	test "$with_gnu_ld" != yes && break
-+	;;
-+      esac
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi
-+fi
-+
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
+       # 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'*)
+@@ -12792,21 +14186,21 @@
+ 
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+-  echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
 +  { echo "$as_me:$LINENO: result: $LD" >&5
 +echo "${ECHO_T}$LD" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+   { (exit 1); exit 1; }; }
+ fi
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 +  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+  lt_cv_prog_gnu_ld=yes
-+  ;;
-+*)
-+  lt_cv_prog_gnu_ld=no
-+  ;;
-+esac
-+fi
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -12816,8 +14210,8 @@
+   ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+
-+
-+
-+  # 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
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+ 
+ 
+@@ -12825,8 +14219,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
+-    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+
-+    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-+    #     investigate it a little bit more. (MM)
-+    wlarc='${wl}'
-+
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-+	grep 'no-whole-archive' > /dev/null; then
-+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      whole_archive_flag_spec_CXX=
-+    fi
-+  else
-+    with_gnu_ld=no
-+    wlarc=
-+
-+    # A generic and very simple default shared library creation
-+    # command for GNU C++ for the case where it uses the native
-+    # 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.
+ 
+     hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+     export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+@@ -12852,7 +14246,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.
+-    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
 +    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+  fi
-+
-+  # Commands to make compiler produce verbose output that lists
-+  # what "hidden" libraries, object files and flags are used when
-+  # linking a shared library.
-+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+else
-+  GXX=no
-+  with_gnu_ld=no
-+  wlarc=
-+fi
-+
-+# PORTME: fill in a description of your system's C++ link characteristics
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists
+@@ -12867,8 +14261,8 @@
+ fi
+ 
+ # PORTME: fill in a description of your system's C++ link characteristics
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-+ld_shlibs_CXX=yes
-+case $host_os in
-+  aix3*)
-+    # FIXME: insert proper C++ library support
-+    ld_shlibs_CXX=no
-+    ;;
-+  aix4* | aix5*)
-+    if test "$host_cpu" = ia64; then
-+      # On IA64, the linker does run time linking by default, so we don't
-+      # have to do anything special.
+ ld_shlibs_CXX=yes
+ case $host_os in
+   aix3*)
+@@ -12883,8 +14277,23 @@
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+     else
+-      # KDE requires run time linking.  Make it the default.
+-      aix_use_runtimelinking=yes
 +      aix_use_runtimelinking=no
-+      exp_sym_flag='-Bexport'
-+      no_entry_flag=""
-+    else
-+      aix_use_runtimelinking=no
 +
 +      # Test if we are trying to use run time linking or normal
 +      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -30516,86 +17082,58 @@
 +	;;
 +      esac
 +
-+      exp_sym_flag='-bexport'
-+      no_entry_flag='-bnoentry'
-+    fi
-+
-+    # When large executables or shared objects are built, AIX ld can
-+    # have problems creating the table of contents.  If linking a library
-+    # or program results in "error TOC overflow" add -mminimal-toc to
-+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+    archive_cmds_CXX=''
-+    hardcode_direct_CXX=yes
-+    hardcode_libdir_separator_CXX=':'
-+    link_all_deplibs_CXX=yes
-+
-+    if test "$GXX" = yes; then
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+     fi
+@@ -12901,7 +14310,7 @@
+     link_all_deplibs_CXX=yes
+ 
+     if test "$GXX" = yes; then
+-      case $host_os in aix4.012|aix4.012.*)
 +      case $host_os in aix4.[012]|aix4.[012].*)
-+      # 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`
-+	if test -f "$collect2name" && \
-+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	then
-+	  # We have reworked collect2
-+	  hardcode_direct_CXX=yes
-+	else
-+	  # We have old collect2
-+	  hardcode_direct_CXX=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  hardcode_minus_L_CXX=yes
-+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-+	  hardcode_libdir_separator_CXX=
-+	fi
+       # 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`
+@@ -12920,8 +14329,12 @@
+ 	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+ 	  hardcode_libdir_separator_CXX=
+ 	fi
 +	;;
-+      esac
-+      shared_flag='-shared'
+       esac
+       shared_flag='-shared'
 +      if test "$aix_use_runtimelinking" = yes; then
 +	shared_flag="$shared_flag "'${wl}-G'
 +      fi
-+    else
-+      # not using gcc
-+      if test "$host_cpu" = ia64; then
-+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	# chokes on -Wl,-G. The following line is correct:
-+	shared_flag='-G'
-+      else
-+	if test "$aix_use_runtimelinking" = yes; then
+     else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+@@ -12930,15 +14343,16 @@
+ 	shared_flag='-G'
+       else
+ 	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='-qmkshrobj ${wl}-G'
 +	  shared_flag='${wl}-G'
-+	else
+ 	else
+-	  shared_flag='-qmkshrobj'
 +	  shared_flag='${wl}-bM:SRE'
-+	fi
-+      fi
-+    fi
-+
+ 	fi
+       fi
+     fi
+ 
+-    # Let the compiler handle the export list.
+-    always_export_symbols_CXX=no
 +    # It seems that -bexpall does not export symbols beginning with
 +    # underscore (_), so it is better to generate a list of symbols to export.
 +    always_export_symbols_CXX=yes
-+    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.
-+      allow_undefined_flag_CXX='-berok'
-+      # Determine the default libpath from the value encoded in an empty executable.
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+     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.
+@@ -12960,27 +14374,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -30603,59 +17141,65 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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; }
+ }'`
+@@ -12991,20 +14401,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-+
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+-      archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+     else
-+      if test "$host_cpu" = ia64; then
-+	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-+	allow_undefined_flag_CXX="-z nodefs"
+      else
+       if test "$host_cpu" = ia64; then
+ 	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+ 	allow_undefined_flag_CXX="-z nodefs"
+-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
 +	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+      else
-+	# Determine the default libpath from the value encoded in an empty executable.
-+	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+       else
+ 	# Determine the default libpath from the value encoded in an empty executable.
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -13023,27 +14434,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -30663,46 +17207,62 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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; }
+ }'`
+@@ -13054,8 +14461,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	# Warning - without using the other run time loading flags,
-+	# -berok will link without error, but may produce a broken library.
-+	no_undefined_flag_CXX=' ${wl}-bernotok'
-+	allow_undefined_flag_CXX=' ${wl}-berok'
-+	# Exported symbols can be pulled into shared objects from archives
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -13064,16 +14473,26 @@
+ 	# -berok will link without error, but may produce a broken library.
+ 	no_undefined_flag_CXX=' ${wl}-bernotok'
+ 	allow_undefined_flag_CXX=' ${wl}-berok'
+-	# -bexpall does not export symbols beginning with underscore (_)
+-	always_export_symbols_CXX=yes
+ 	# Exported symbols can be pulled into shared objects from archives
+-	whole_archive_flag_spec_CXX=' '
 +	whole_archive_flag_spec_CXX='$convenience'
-+	archive_cmds_need_lc_CXX=yes
+ 	archive_cmds_need_lc_CXX=yes
+-	# This is similar to how AIX traditionally builds it's shared libraries.
+-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +	# This is similar to how AIX traditionally builds its shared libraries.
 +	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+      fi
-+    fi
-+    ;;
+       fi
+     fi
+     ;;
 +
 +  beos*)
 +    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -30715,38 +17275,34 @@
 +    fi
 +    ;;
 +
-+  chorus*)
-+    case $cc_basename in
-+      *)
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
-+    esac
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # _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'
+   chorus*)
+     case $cc_basename in
+       *)
+@@ -13087,12 +14506,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'
+-    allow_undefined_flag_CXX=no
 +    allow_undefined_flag_CXX=unsupported
-+    always_export_symbols_CXX=no
-+    enable_shared_with_static_runtimes_CXX=yes
-+
-+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+     always_export_symbols_CXX=no
+     enable_shared_with_static_runtimes_CXX=yes
+ 
+     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 +      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      # 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
-+	cp $export_symbols $output_objdir/$soname.def;
-+      else
-+	echo EXPORTS > $output_objdir/$soname.def;
-+	cat $export_symbols >> $output_objdir/$soname.def;
-+      fi~
+       # 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
+@@ -13101,70 +14520,81 @@
+ 	echo EXPORTS > $output_objdir/$soname.def;
+ 	cat $export_symbols >> $output_objdir/$soname.def;
+       fi~
+-      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 +      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+    else
-+      ld_shlibs_CXX=no
-+    fi
-+  ;;
+     else
+       ld_shlibs_CXX=no
+     fi
+   ;;
 +      darwin* | rhapsody*)
 +        case $host_os in
 +        rhapsody* | darwin1.[012])
@@ -30773,13 +17329,62 @@
 +      hardcode_shlibpath_var_CXX=unsupported
 +      whole_archive_flag_spec_CXX=''
 +      link_all_deplibs_CXX=yes
-+
+ 
+-  darwin* | rhapsody*)
+-  if test "$GXX" = yes; then
+-    archive_cmds_need_lc_CXX=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
+-      allow_undefined_flag_CXX='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.012)
+-	    allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
 +    if test "$GXX" = yes ; then
 +      lt_int_apple_cc_single_mod=no
 +      output_verbose_link_cmd='echo'
 +      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
 +       lt_int_apple_cc_single_mod=yes
-+      fi
+       fi
+-      ;;
+-    esac
+-    lt_int_apple_cc_single_mod=no
+-    output_verbose_link_cmd='echo'
+-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-      lt_int_apple_cc_single_mod=yes
+-    fi
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    else
+-      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-    fi
+-    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    else
+-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    fi
+-    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    hardcode_direct_CXX=no
+-    hardcode_automatic_CXX=yes
+-    hardcode_shlibpath_var_CXX=unsupported
+-    whole_archive_flag_spec_CXX='-all_load $convenience'
+-    link_all_deplibs_CXX=yes
+-  else
+-    ld_shlibs_CXX=no
+-  fi
+-    ;;
 +      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 +       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
 +      else
@@ -30809,106 +17414,120 @@
 +      esac
 +      fi
 +        ;;
-+
-+  dgux*)
-+    case $cc_basename in
+ 
+   dgux*)
+     case $cc_basename in
+-      ec++)
 +      ec++*)
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      ghcx)
 +      ghcx*)
-+	# Green Hills C++ Compiler
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
-+    esac
-+    ;;
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+@@ -13175,14 +14605,14 @@
+ 	;;
+     esac
+     ;;
+-  freebsd12*)
 +  freebsd[12]*)
-+    # C++ shared libraries reported to be fairly broken before switch to ELF
-+    ld_shlibs_CXX=no
-+    ;;
-+  freebsd-elf*)
-+    archive_cmds_need_lc_CXX=no
-+    ;;
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     ld_shlibs_CXX=no
+     ;;
+   freebsd-elf*)
+     archive_cmds_need_lc_CXX=no
+     ;;
+-  freebsd* | kfreebsd*-gnu)
 +  freebsd* | dragonfly*)
-+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+    # conventions
-+    ld_shlibs_CXX=yes
-+    ;;
-+  gnu*)
-+    ;;
-+  hpux9*)
-+    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-+    hardcode_libdir_separator_CXX=:
-+    export_dynamic_flag_spec_CXX='${wl}-E'
-+    hardcode_direct_CXX=yes
-+    hardcode_minus_L_CXX=yes # Not in the search PATH,
-+				# but as the default
-+				# location of the library.
-+
-+    case $cc_basename in
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     ld_shlibs_CXX=yes
+@@ -13199,12 +14629,12 @@
+ 				# location of the library.
+ 
+     case $cc_basename in
+-    CC)
 +    CC*)
-+      # FIXME: insert proper C++ library support
-+      ld_shlibs_CXX=no
-+      ;;
+       # FIXME: insert proper C++ library support
+       ld_shlibs_CXX=no
+       ;;
+-    aCC)
+-      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 +    aCC*)
 +      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      # Commands to make compiler produce verbose output that lists
-+      # what "hidden" libraries, object files and flags are used when
-+      # linking a shared library.
-+      #
-+      # There doesn't appear to be a way to prevent this compiler from
-+      # 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.
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+@@ -13213,11 +14643,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.
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 +      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      ;;
-+    *)
-+      if test "$GXX" = yes; then
+       ;;
+     *)
+       if test "$GXX" = yes; then
+-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 +        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      else
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+      fi
-+      ;;
-+    esac
-+    ;;
-+  hpux10*|hpux11*)
-+    if test $with_gnu_ld = no; then
+       else
+         # FIXME: insert proper C++ library support
+         ld_shlibs_CXX=no
+@@ -13227,33 +14657,22 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
+-      hppa*64*)
+-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 +      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 +      hardcode_libdir_separator_CXX=:
 +
 +      case $host_cpu in
 +      hppa*64*|ia64*)
-+	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-+        ;;
-+      *)
-+	export_dynamic_flag_spec_CXX='${wl}-E'
-+        ;;
-+      esac
-+    fi
+ 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+-	hardcode_libdir_separator_CXX=:
+-        ;;
+-      ia64*)
+-	hardcode_libdir_flag_spec_CXX='-L$libdir'
+         ;;
+       *)
+-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_separator_CXX=:
+ 	export_dynamic_flag_spec_CXX='${wl}-E'
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
+-    hppa*64*)
+-      hardcode_direct_CXX=no
+-      hardcode_shlibpath_var_CXX=no
+-      ;;
+-    ia64*)
 +    case $host_cpu in
 +    hppa*64*|ia64*)
-+      hardcode_direct_CXX=no
-+      hardcode_shlibpath_var_CXX=no
-+      ;;
-+    *)
-+      hardcode_direct_CXX=yes
-+      hardcode_minus_L_CXX=yes # Not in the search PATH,
-+					      # but as the default
-+					      # location of the library.
-+      ;;
-+    esac
-+
-+    case $cc_basename in
+       hardcode_direct_CXX=no
+       hardcode_shlibpath_var_CXX=no
+-      hardcode_minus_L_CXX=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+       ;;
+     *)
+       hardcode_direct_CXX=yes
+@@ -13264,17 +14683,20 @@
+     esac
+ 
+     case $cc_basename in
+-      CC)
 +      CC*)
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 +      aCC*)
 +	case $host_cpu in
 +	hppa*64*)
@@ -30916,43 +17535,37 @@
 +	  ;;
 +	ia64*)
 +	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	  ;;
-+	*)
+ 	  ;;
+ 	*)
+-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
 +	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	  ;;
-+	esac
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# 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.
-+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+      *)
-+	if test "$GXX" = yes; then
-+	  if test $with_gnu_ld = no; then
+ 	  ;;
+ 	esac
+ 	# Commands to make compiler produce verbose output that lists
+@@ -13290,12 +14712,15 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
+-	    ia64*|hppa*64*)
+-	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 +	    case $host_cpu in
 +	    hppa*64*)
 +	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	      ;;
 +	    ia64*)
 +	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      ;;
-+	    *)
+ 	      ;;
+ 	    *)
+-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
 +	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      ;;
-+	    esac
-+	  fi
-+	else
-+	  # FIXME: insert proper C++ library support
-+	  ld_shlibs_CXX=no
-+	fi
-+	;;
-+    esac
-+    ;;
+ 	      ;;
+ 	    esac
+ 	  fi
+@@ -13306,11 +14731,25 @@
+ 	;;
+     esac
+     ;;
 +  interix3*)
 +    hardcode_direct_CXX=no
 +    hardcode_shlibpath_var_CXX=no
@@ -30967,62 +17580,57 @@
 +    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +    ;;
-+  irix5* | irix6*)
-+    case $cc_basename in
+   irix5* | irix6*)
+     case $cc_basename in
+-      CC)
 +      CC*)
-+	# SGI C++
+ 	# SGI C++
+-	archive_cmds_CXX='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
 +	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-+	# necessary to make sure instantiated templates are included
-+	# in the archive.
-+	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+	;;
-+      *)
-+	if test "$GXX" = yes; then
-+	  if test "$with_gnu_ld" = no; then
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+@@ -13321,9 +14760,9 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test "$with_gnu_ld" = no; then
+-	    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
 +	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	  else
+ 	  else
+-	    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 +	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-+	  fi
-+	fi
-+	link_all_deplibs_CXX=yes
-+	;;
-+    esac
-+    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator_CXX=:
-+    ;;
+ 	  fi
+ 	fi
+ 	link_all_deplibs_CXX=yes
+@@ -13332,16 +14771,16 @@
+     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+     hardcode_libdir_separator_CXX=:
+     ;;
+-  linux*)
 +  linux* | k*bsd*-gnu)
-+    case $cc_basename in
+     case $cc_basename in
+-      KCC)
 +      KCC*)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+-	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
 +	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 +	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# 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.
-+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+
-+	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
-+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-+	;;
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+@@ -13359,20 +14798,44 @@
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+-      icpc)
 +      icpc*)
-+	# Intel C++
-+	with_gnu_ld=yes
+ 	# Intel C++
+ 	with_gnu_ld=yes
 +	# version 8.0 and above of icpc choke on multiply defined symbols
 +	# if we add $predep_objects and $postdep_objects, however 7.1 and
 +	# earlier do not add the objects themselves.
@@ -31040,11 +17648,14 @@
 +	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	  ;;
 +	esac
-+	archive_cmds_need_lc_CXX=no
-+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	;;
+ 	archive_cmds_need_lc_CXX=no
+-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	;;
+-      cxx)
 +      pgCC*)
 +        # Portland Group C++ compiler
 +	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
@@ -31055,57 +17666,36 @@
 +	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
 +        ;;
 +      cxx*)
-+	# Compaq C++
+ 	# Compaq C++
+-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 +	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+
-+	runpath_var=LD_RUN_PATH
-+	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-+	hardcode_libdir_separator_CXX=:
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# 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.
-+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+    esac
-+    ;;
-+  lynxos*)
-+    # FIXME: insert proper C++ library support
-+    ld_shlibs_CXX=no
-+    ;;
-+  m88k*)
-+    # FIXME: insert proper C++ library support
-+    ld_shlibs_CXX=no
-+    ;;
-+  mvs*)
-+    case $cc_basename in
+ 
+ 	runpath_var=LD_RUN_PATH
+ 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+@@ -13400,7 +14863,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
 +      cxx*)
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
-+    esac
-+    ;;
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+@@ -13410,7 +14873,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
 +  netbsd* | netbsdelf*-gnu)
-+    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=
-+      hardcode_libdir_flag_spec_CXX='-R$libdir'
-+      hardcode_direct_CXX=yes
-+      hardcode_shlibpath_var_CXX=no
-+    fi
-+    # 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::"'
-+    ;;
+     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=
+@@ -13421,15 +14884,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::"'
+     ;;
 +  openbsd2*)
 +    # C++ shared libraries are fairly broken
 +    ld_shlibs_CXX=no
@@ -31122,225 +17712,214 @@
 +    fi
 +    output_verbose_link_cmd='echo'
 +    ;;
-+  osf3*)
-+    case $cc_basename in
+   osf3*)
+     case $cc_basename in
+-      KCC)
 +      KCC*)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
 +	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	hardcode_libdir_separator_CXX=:
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-+
-+	;;
+ 
+ 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ 	hardcode_libdir_separator_CXX=:
+@@ -13439,14 +14918,14 @@
+ 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ 
+ 	;;
+-      RCC)
 +      RCC*)
-+	# Rational C++ 2.4.1
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      cxx)
 +      cxx*)
-+	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ 	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
 +	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+
-+	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+	hardcode_libdir_separator_CXX=:
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# 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.
-+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+      *)
-+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ 
+ 	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ 	hardcode_libdir_separator_CXX=:
+@@ -13464,7 +14943,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
 +	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+
-+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+	  hardcode_libdir_separator_CXX=:
-+
-+	  # Commands to make compiler produce verbose output that lists
-+	  # what "hidden" libraries, object files and flags are used when
-+	  # linking a shared library.
-+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+	else
-+	  # FIXME: insert proper C++ library support
-+	  ld_shlibs_CXX=no
-+	fi
-+	;;
-+    esac
-+    ;;
-+  osf4* | osf5*)
-+    case $cc_basename in
+ 
+ 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ 	  hardcode_libdir_separator_CXX=:
+@@ -13483,13 +14962,13 @@
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+-      KCC)
 +      KCC*)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
 +	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	hardcode_libdir_separator_CXX=:
-+
-+	# Archives containing C++ object files must be created using
-+	# the KAI C++ compiler.
-+	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
-+	;;
+ 
+ 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ 	hardcode_libdir_separator_CXX=:
+@@ -13498,17 +14977,17 @@
+ 	# the KAI C++ compiler.
+ 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
+ 	;;
+-      RCC)
 +      RCC*)
-+	# Rational C++ 2.4.1
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      cxx)
 +      cxx*)
-+	allow_undefined_flag_CXX=' -expect_unresolved \*'
+ 	allow_undefined_flag_CXX=' -expect_unresolved \*'
+-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
 +	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+	  echo "-hidden">> $lib.exp~
+ 	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ 	  echo "-hidden">> $lib.exp~
+-	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
 +	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-+	  $rm $lib.exp'
-+
-+	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-+	hardcode_libdir_separator_CXX=:
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# 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.
-+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+      *)
-+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ 	  $rm $lib.exp'
+ 
+ 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+@@ -13527,7 +15006,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
 +	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+
-+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+	  hardcode_libdir_separator_CXX=:
-+
-+	  # Commands to make compiler produce verbose output that lists
-+	  # what "hidden" libraries, object files and flags are used when
-+	  # linking a shared library.
-+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+	else
-+	  # FIXME: insert proper C++ library support
-+	  ld_shlibs_CXX=no
-+	fi
-+	;;
-+    esac
-+    ;;
-+  psos*)
-+    # FIXME: insert proper C++ library support
-+    ld_shlibs_CXX=no
-+    ;;
-+  sunos4*)
-+    case $cc_basename in
+ 
+ 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ 	  hardcode_libdir_separator_CXX=:
+@@ -13548,27 +15027,14 @@
+     # FIXME: insert proper C++ library support
+     ld_shlibs_CXX=no
+     ;;
+-  sco*)
+-    archive_cmds_need_lc_CXX=no
+-    case $cc_basename in
+-      CC)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-    esac
+-    ;;
+   sunos4*)
+     case $cc_basename in
+-      CC)
 +      CC*)
-+	# Sun C++ 4.x
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      lcc)
 +      lcc*)
-+	# Lucid
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
-+    esac
-+    ;;
-+  solaris*)
-+    case $cc_basename in
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+@@ -13581,36 +15047,33 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
 +      CC*)
-+	# Sun C++ 4.2, 5.x and Centerline C++
+ 	# Sun C++ 4.2, 5.x and Centerline C++
 +        archive_cmds_need_lc_CXX=yes
-+	no_undefined_flag_CXX=' -zdefs'
+ 	no_undefined_flag_CXX=' -zdefs'
+-	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
 +	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
 +	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+	hardcode_libdir_flag_spec_CXX='-R$libdir'
-+	hardcode_shlibpath_var_CXX=no
-+	case $host_os in
+ 
+ 	hardcode_libdir_flag_spec_CXX='-R$libdir'
+ 	hardcode_shlibpath_var_CXX=no
+ 	case $host_os in
+-	  solaris2.0-5 | solaris2.0-5.*) ;;
 +	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-+	  *)
-+	    # The C++ compiler is used as linker so we must use $wl
-+	    # flag to pass the commands to the underlying system
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+-	    # linker.
 +	    # linker. We must also pass each convience library through
 +	    # to the system linker between allextract/defaultextract.
 +	    # The C++ compiler will combine linker options so we
 +	    # cannot just pass the convience library names through
 +	    # without $wl.
-+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
 +	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-+	    ;;
-+	esac
-+	link_all_deplibs_CXX=yes
-+
+ 	    ;;
+ 	esac
+ 	link_all_deplibs_CXX=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# 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.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 +	output_verbose_link_cmd='echo'
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-+	# necessary to make sure instantiated templates are included
-+	# in the archive.
-+	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-+	;;
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -13618,9 +15081,9 @@
+ 	# in the archive.
+ 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+ 	;;
+-      gcx)
 +      gcx*)
-+	# Green Hills C++ Compiler
+ 	# Green Hills C++ Compiler
+-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
 +	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+
-+	# The C++ compiler must be used to create the archive.
-+	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+	;;
-+      *)
-+	# GNU C++ compiler with Solaris linker
-+	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
+ 
+ 	# The C++ compiler must be used to create the archive.
+ 	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+@@ -13630,9 +15093,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
+-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
 +	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
 +		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+	  else
-+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+	    # platform.
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -13641,9 +15104,9 @@
+ 	  else
+ 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	    # platform.
+-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
 +	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
 +		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+	  fi
-+
-+	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-+	fi
-+	;;
-+    esac
-+    ;;
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -13656,12 +15119,63 @@
+ 	;;
+     esac
+     ;;
+-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
 +  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 +    no_undefined_flag_CXX='${wl}-z,text'
 +    archive_cmds_need_lc_CXX=no
@@ -31376,7 +17955,7 @@
 +    # names for shared libraries.
 +    no_undefined_flag_CXX='${wl}-z,text'
 +    allow_undefined_flag_CXX='${wl}-z,nodefs'
-+    archive_cmds_need_lc_CXX=no
+     archive_cmds_need_lc_CXX=no
 +    hardcode_shlibpath_var_CXX=no
 +    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
 +    hardcode_libdir_separator_CXX=':'
@@ -31394,142 +17973,47 @@
 +	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	;;
 +    esac
-+    ;;
-+  tandem*)
-+    case $cc_basename in
+     ;;
+   tandem*)
+     case $cc_basename in
+-      NCC)
 +      NCC*)
-+	# NonStop-UX NCC 3.20
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
-+    esac
-+    ;;
-+  vxworks*)
-+    # FIXME: insert proper C++ library support
-+    ld_shlibs_CXX=no
-+    ;;
-+  *)
-+    # FIXME: insert proper C++ library support
-+    ld_shlibs_CXX=no
-+    ;;
-+esac
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+@@ -13681,8 +15195,8 @@
+     ld_shlibs_CXX=no
+     ;;
+ esac
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-+test "$ld_shlibs_CXX" = no && can_build_shared=no
-+
-+GCC_CXX="$GXX"
-+LD_CXX="$LD"
-+
-+## 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
-+## what you are doing...
-+
-+cat > conftest.$ac_ext <<EOF
-+class Foo
-+{
-+public:
-+  Foo (void) { a = 0; }
-+private:
-+  int a;
-+};
-+EOF
-+
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  # Parse the compiler output and extract the necessary
-+  # objects, libraries and library flags.
-+
-+  # Sentinel used to keep track of whether or not we are before
-+  # the conftest object file.
-+  pre_test_object_deps_done=no
-+
-+  # 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.
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+ 
+ GCC_CXX="$GXX"
+@@ -13718,7 +15232,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.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
 +  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-+
-+  for p in `eval $output_verbose_link_cmd`; do
-+    case $p in
-+
-+    -L* | -R* | -l*)
-+       # Some compilers place space between "-{L,R}" and the path.
-+       # Remove the space.
-+       if test $p = "-L" \
-+	  || test $p = "-R"; then
-+	 prev=$p
-+	 continue
-+       else
-+	 prev=
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 case $p in
-+	 -L* | -R*)
-+	   # Internal compiler library paths should come after those
-+	   # provided the user.  The postdeps already come after the
-+	   # user supplied libs so there is no need to process them.
-+	   if test -z "$compiler_lib_search_path_CXX"; then
-+	     compiler_lib_search_path_CXX="${prev}${p}"
-+	   else
-+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
-+	   fi
-+	   ;;
-+	 # The "-l" case would never come before the object being
-+	 # linked, so don't bother handling this case.
-+	 esac
-+       else
-+	 if test -z "$postdeps_CXX"; then
-+	   postdeps_CXX="${prev}${p}"
-+	 else
-+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-+	 fi
-+       fi
-+       ;;
-+
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+@@ -13758,7 +15272,7 @@
+        fi
+        ;;
+ 
+-    *.$objext|*.$libext)
 +    *.$objext)
-+       # This assumes that the test object file only shows up
-+       # once in the compiler output.
-+       if test "$p" = "conftest.$objext"; then
-+	 pre_test_object_deps_done=yes
-+	 continue
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 if test -z "$predep_objects_CXX"; then
-+	   predep_objects_CXX="$p"
-+	 else
-+	   predep_objects_CXX="$predep_objects_CXX $p"
-+	 fi
-+       else
-+	 if test -z "$postdep_objects_CXX"; then
-+	   postdep_objects_CXX="$p"
-+	 else
-+	   postdep_objects_CXX="$postdep_objects_CXX $p"
-+	 fi
-+       fi
-+       ;;
-+
-+    *) ;; # Ignore the rest.
-+
-+    esac
-+  done
-+
-+  # Clean up.
-+  rm -f a.out a.exe
-+else
-+  echo "libtool.m4: error: problem compiling CXX test program"
-+fi
-+
-+$rm -f confest.$objext
-+
+        # This assumes that the test object file only shows up
+        # once in the compiler output.
+        if test "$p" = "conftest.$objext"; then
+@@ -13794,6 +15308,29 @@
+ 
+ $rm -f confest.$objext
+ 
 +# PORTME: override above test on systems where it is broken
 +case $host_os in
 +interix3*)
@@ -31553,96 +18037,51 @@
 +esac
 +
 +
-+case " $postdeps_CXX " in
-+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-+esac
-+
-+lt_prog_compiler_wl_CXX=
-+lt_prog_compiler_pic_CXX=
-+lt_prog_compiler_static_CXX=
-+
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -13802,8 +15339,8 @@
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX=
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-+
-+  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
-+    lt_prog_compiler_wl_CXX='-Wl,'
-+    lt_prog_compiler_static_CXX='-static'
-+
-+    case $host_os in
-+    aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static_CXX='-Bstatic'
-+      fi
-+      ;;
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    mingw* | os2* | pw32*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic_CXX='-fno-common'
-+      ;;
-+    *djgpp*)
-+      # DJGPP does not support shared libraries at all
-+      lt_prog_compiler_pic_CXX=
-+      ;;
+ 
+   # C++ specific cases for pic, static, wl, etc.
+   if test "$GXX" = yes; then
+@@ -13841,6 +15378,10 @@
+       # DJGPP does not support shared libraries at all
+       lt_prog_compiler_pic_CXX=
+       ;;
 +    interix3*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	lt_prog_compiler_pic_CXX=-Kconform_pic
-+      fi
-+      ;;
-+    hpux*)
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	lt_prog_compiler_pic_CXX=-Kconform_pic
+@@ -13849,7 +15390,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
 +      case $host_cpu in
-+      hppa*64*|ia64*)
-+	;;
-+      *)
-+	lt_prog_compiler_pic_CXX='-fPIC'
-+	;;
-+      esac
-+      ;;
-+    *)
-+      lt_prog_compiler_pic_CXX='-fPIC'
-+      ;;
-+    esac
-+  else
-+    case $host_os in
-+      aix4* | aix5*)
-+	# All AIX code is PIC.
-+	if test "$host_cpu" = ia64; then
-+	  # AIX 5 now supports IA64 processor
-+	  lt_prog_compiler_static_CXX='-Bstatic'
-+	else
-+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-+	fi
-+	;;
-+      chorus*)
-+	case $cc_basename in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+@@ -13874,18 +15415,28 @@
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+-	cxch68)
 +	cxch68*)
-+	  # Green Hills C++ Compiler
-+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-+	  ;;
-+	esac
-+	;;
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
 +       darwin*)
 +         # PIC is the default on this platform
 +         # Common symbols not allowed in MH_DYLIB files
@@ -31653,75 +18092,82 @@
 +           ;;
 +         esac
 +       ;;
-+      dgux*)
-+	case $cc_basename in
+       dgux*)
+ 	case $cc_basename in
+-	  ec++)
 +	  ec++*)
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    ;;
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    ;;
+-	  ghcx)
 +	  ghcx*)
-+	    # Green Hills C++ Compiler
-+	    lt_prog_compiler_pic_CXX='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
+ 	    # Green Hills C++ Compiler
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    ;;
+@@ -13893,22 +15444,22 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu)
 +      freebsd* | dragonfly*)
-+	# FreeBSD uses GNU C++
-+	;;
-+      hpux9* | hpux10* | hpux11*)
-+	case $cc_basename in
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+ 	case $cc_basename in
+-	  CC)
 +	  CC*)
-+	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
 +	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-+	    if test "$host_cpu" != ia64; then
-+	      lt_prog_compiler_pic_CXX='+Z'
-+	    fi
-+	    ;;
+ 	    if test "$host_cpu" != ia64; then
+ 	      lt_prog_compiler_pic_CXX='+Z'
+ 	    fi
+ 	    ;;
+-	  aCC)
 +	  aCC*)
-+	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
 +	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
 +	    case $host_cpu in
-+	    hppa*64*|ia64*)
-+	      # +Z the default
-+	      ;;
-+	    *)
-+	      lt_prog_compiler_pic_CXX='+Z'
-+	      ;;
-+	    esac
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -13921,9 +15472,13 @@
+ 	    ;;
+ 	esac
+ 	;;
 +      interix*)
 +	# This is c89, which is MS Visual C++ (no shared libs)
 +	# Anyone wants to do a port?
 +	;;
-+      irix5* | irix6* | nonstopux*)
-+	case $cc_basename in
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+-	  CC)
 +	  CC*)
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_static_CXX='-non_shared'
-+	    # CC pic flag -KPIC is the default.
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_static_CXX='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+@@ -13932,20 +15487,26 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux*)
 +      linux* | k*bsd*-gnu)
-+	case $cc_basename in
+ 	case $cc_basename in
+-	  KCC)
 +	  KCC*)
-+	    # KAI C++ Compiler
-+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-+	    lt_prog_compiler_pic_CXX='-fPIC'
-+	    ;;
+ 	    # KAI C++ Compiler
+ 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+ 	    lt_prog_compiler_pic_CXX='-fPIC'
+ 	    ;;
+-	  icpc)
 +	  icpc* | ecpc*)
-+	    # Intel C++
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    lt_prog_compiler_static_CXX='-static'
-+	    ;;
+ 	    # Intel C++
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    lt_prog_compiler_static_CXX='-static'
+ 	    ;;
+-	  cxx)
 +	  pgCC*)
 +	    # Portland Group C++ compiler.
 +	    lt_prog_compiler_wl_CXX='-Wl,'
@@ -31729,95 +18175,96 @@
 +	    lt_prog_compiler_static_CXX='-Bstatic'
 +	    ;;
 +	  cxx*)
-+	    # Compaq C++
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    lt_prog_compiler_pic_CXX=
-+	    lt_prog_compiler_static_CXX='-non_shared'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      lynxos*)
-+	;;
-+      m88k*)
-+	;;
-+      mvs*)
-+	case $cc_basename in
+ 	    # Compaq C++
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -13962,25 +15523,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
 +	  cxx*)
-+	    lt_prog_compiler_pic_CXX='-W c,exportall'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
+ 	    lt_prog_compiler_pic_CXX='-W c,exportall'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
 +      netbsd* | netbsdelf*-gnu)
-+	;;
-+      osf3* | osf4* | osf5*)
-+	case $cc_basename in
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+-	  KCC)
 +	  KCC*)
-+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-+	    ;;
+ 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+ 	    ;;
+-	  RCC)
 +	  RCC*)
-+	    # Rational C++ 2.4.1
-+	    lt_prog_compiler_pic_CXX='-pic'
-+	    ;;
+ 	    # Rational C++ 2.4.1
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    ;;
+-	  cxx)
 +	  cxx*)
-+	    # Digital/Compaq C++
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    lt_prog_compiler_pic_CXX=
-+	    lt_prog_compiler_static_CXX='-non_shared'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      psos*)
-+	;;
-+      solaris*)
-+	case $cc_basename in
+ 	    # Digital/Compaq C++
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+@@ -13994,24 +15555,15 @@
+ 	;;
+       psos*)
+ 	;;
+-      sco*)
+-	case $cc_basename in
+-	  CC)
+-	    lt_prog_compiler_pic_CXX='-fPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+       solaris*)
+ 	case $cc_basename in
+-	  CC)
 +	  CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    lt_prog_compiler_wl_CXX='-Qoption ld '
-+	    ;;
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    lt_prog_compiler_static_CXX='-Bstatic'
+ 	    lt_prog_compiler_wl_CXX='-Qoption ld '
+ 	    ;;
+-	  gcx)
 +	  gcx*)
-+	    # Green Hills C++ Compiler
-+	    lt_prog_compiler_pic_CXX='-PIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sunos4*)
-+	case $cc_basename in
+ 	    # Green Hills C++ Compiler
+ 	    lt_prog_compiler_pic_CXX='-PIC'
+ 	    ;;
+@@ -14021,12 +15573,12 @@
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+-	  CC)
 +	  CC*)
-+	    # Sun C++ 4.x
-+	    lt_prog_compiler_pic_CXX='-pic'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    ;;
+ 	    # Sun C++ 4.x
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    lt_prog_compiler_static_CXX='-Bstatic'
+ 	    ;;
+-	  lcc)
 +	  lcc*)
-+	    # Lucid
-+	    lt_prog_compiler_pic_CXX='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      tandem*)
-+	case $cc_basename in
+ 	    # Lucid
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    ;;
+@@ -14036,7 +15588,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
 +	  NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
+ 	    # NonStop-UX NCC 3.20
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    ;;
+@@ -14044,7 +15596,14 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      unixware*)
 +      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +	case $cc_basename in
 +	  CC*)
@@ -31826,82 +18273,81 @@
 +	    lt_prog_compiler_static_CXX='-Bstatic'
 +	    ;;
 +	esac
-+	;;
-+      vxworks*)
-+	;;
-+      *)
-+	lt_prog_compiler_can_build_shared_CXX=no
-+	;;
-+    esac
-+  fi
-+
+ 	;;
+       vxworks*)
+ 	;;
+@@ -14054,16 +15613,16 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic_CXX"; then
-+
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_CXX"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-+if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_prog_compiler_pic_works_CXX=no
-+  ac_outfile=conftest.$ac_objext
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # 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 \
+ if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -14077,26 +15636,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 \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14083: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:15642: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:14087: \$? = $ac_status" >&5
 +   echo "$as_me:15646: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
+    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
+-     if test ! -s conftest.err; then
 +     # So say no if there are warnings other than the usual output.
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
 +     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_prog_compiler_pic_works_CXX=yes
-+     fi
-+   fi
-+   $rm conftest*
-+
-+fi
+        lt_prog_compiler_pic_works_CXX=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
-+
-+if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-+    case $lt_prog_compiler_pic_CXX in
-+     "" | " "*) ;;
-+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-+     esac
-+else
-+    lt_prog_compiler_pic_CXX=
-+     lt_prog_compiler_can_build_shared_CXX=no
-+fi
-+
-+fi
+ 
+ if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+     case $lt_prog_compiler_pic_CXX in
+@@ -14109,7 +15670,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
 +case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic_CXX=
-+    ;;
-+  *)
-+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-+    ;;
-+esac
-+
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic_CXX=
+@@ -14119,8 +15680,50 @@
+     ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -31946,187 +18392,178 @@
 +
 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_prog_compiler_c_o_CXX=no
-+   $rm -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
+ if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -14131,60 +15734,58 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14150: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:15746: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14154: \$? = $ac_status" >&5
 +   echo "$as_me:15750: \$? = $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
-+     # So say no if there are warnings
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
 +     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
 +     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o_CXX=yes
-+     fi
-+   fi
+        lt_cv_prog_compiler_c_o_CXX=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
 +   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
 +   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
 +   $rm out/* && rmdir out
-+   cd ..
-+   rmdir conftest
-+   $rm conftest*
-+
-+fi
+    cd ..
+    rmdir conftest
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
-+
-+
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
+ 
+ 
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
 +  { echo "$as_me:$LINENO: result: $hard_links" >&5
 +echo "${ECHO_T}$hard_links" >&6; }
-+  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;}
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
+   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;}
+@@ -14194,8 +15795,8 @@
+   need_locks=no
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-+
-+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  case $host_os in
-+  aix4* | aix5*)
-+    # If we're using GNU nm, then we don't want the "-C" option.
-+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+    else
-+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+    fi
-+    ;;
-+  pw32*)
-+    export_symbols_cmds_CXX="$ltdll_cmds"
-+  ;;
-+  cygwin* | mingw*)
+ 
+   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+@@ -14212,22 +15813,20 @@
+     export_symbols_cmds_CXX="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 +    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 +  ;;
 +  linux* | k*bsd*-gnu)
 +    link_all_deplibs_CXX=no
-+  ;;
-+  *)
-+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  esac
-+
+   ;;
+   *)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+   esac
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-+test "$ld_shlibs_CXX" = no && can_build_shared=no
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc_CXX" in
-+x|xyes)
-+  # Assume -lc should be added
-+  archive_cmds_need_lc_CXX=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $archive_cmds_CXX in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-+      ;;
-+    '$CC '*)
-+      # 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.
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -14245,8 +15844,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.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
 +      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-+      $rm conftest*
-+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl_CXX
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+@@ -14260,6 +15859,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl_CXX
 +	pic_flag=$lt_prog_compiler_pic_CXX
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-+        allow_undefined_flag_CXX=
-+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+        then
-+	  archive_cmds_need_lc_CXX=no
-+        else
-+	  archive_cmds_need_lc_CXX=yes
-+        fi
-+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $rm conftest*
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -14282,20 +15882,20 @@
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
 +      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
 +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
-+
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
 +shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -14305,7 +15905,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +if test "$GCC" = yes; then
 +  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 +  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
@@ -32141,184 +18578,82 @@
 +else
 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[01] | aix4.[01].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-+      ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -14370,7 +15983,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
 +  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
+   ;;
+ 
+ beos*)
+@@ -14379,7 +15992,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
 +bsdi[45]*)
-+  version_type=linux
-+  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 $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14395,7 +16008,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
 +  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
-+
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -14407,7 +16020,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
 +      $install_prog $dir/$dlname \$dldir/$dlname~
 +      chmod a+x \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-+    mingw*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -14437,7 +16051,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
 +      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    esac
-+    ;;
-+
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
+       ;;
+     esac
+     ;;
+@@ -14460,7 +16074,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+  if test "$GCC" = yes; then
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+  else
-+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
-+
-+dgux*)
-+  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
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
+   # 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"`
+@@ -14483,20 +16097,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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='GNU ld.so'
+-  ;;
+-
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
@@ -32330,95 +18665,65 @@
 +    *) objformat=elf ;;
 +    esac
 +  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -14514,14 +16125,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
 +  freebsd3.[01]* | freebsdelf3.[01]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
 +  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
 +  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
 +  freebsd*) # from 4.6 on
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
-+  esac
-+  ;;
-+
-+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
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
+   esac
+   ;;
+ 
+@@ -14541,9 +16157,9 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  case "$host_cpu" in
 +  case $host_cpu in
-+  ia64*)
+   ia64*)
+-    shrext='.so'
 +    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+   hppa*64*)
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -14558,7 +16174,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
 +     shrext_cmds='.sl'
-+     hardcode_into_libs=yes
-+     dynamic_linker="$host_os dld.sl"
-+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+     soname_spec='${libname}${release}${shared_ext}$major'
-+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+     ;;
-+   *)
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -14569,7 +16185,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
 +    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    ;;
-+  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -14581,6 +16197,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
 +interix3*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -32431,78 +18736,50 @@
 +  hardcode_into_libs=yes
 +  ;;
 +
-+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.
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -14624,29 +16252,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'
-+  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
-+
+   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'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+   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
+ 
 +  # 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,
-+  # 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'
-+  ;;
-+
+   # 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,
+@@ -14656,6 +16281,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -32515,145 +18792,69 @@
 +  dynamic_linker='NetBSD ld.elf_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
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -14665,7 +16302,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}'
 +    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
-+  ;;
-+
-+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
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -14693,8 +16330,13 @@
+ 
+ openbsd*)
+   version_type=sunos
 +  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
+   need_lib_prefix=no
+-  need_version=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
-+  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'
+   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
+@@ -14714,7 +16356,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
 +  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*)
-+  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"
-+  ;;
-+
-+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'
-+  ;;
-+
-+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
-+  ;;
-+
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -14732,13 +16374,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  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
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -14764,7 +16399,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +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
-+  ;;
-+
-+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
-+  ;;
-+
+   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'
+@@ -14797,6 +16432,29 @@
+   fi
+   ;;
+ 
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -32677,21 +18878,21 @@
 +  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
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14808,16 +16466,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 +echo "${ECHO_T}$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
-+
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
+-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
 +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"
@@ -32699,42 +18900,56 @@
 +
 +{ 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_CXX=
-+if test -n "$hardcode_libdir_flag_spec_CXX" || \
+ hardcode_action_CXX=
+ if test -n "$hardcode_libdir_flag_spec_CXX" || \
+-   test -n "$runpath_var CXX" || \
+-   test "X$hardcode_automatic_CXX"="Xyes" ; then
 +   test -n "$runpath_var_CXX" || \
 +   test "X$hardcode_automatic_CXX" = "Xyes" ; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct_CXX" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-+     test "$hardcode_minus_L_CXX" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action_CXX=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action_CXX=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action_CXX=unsupported
-+fi
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct_CXX" != no &&
+@@ -14837,8 +16500,8 @@
+   # directories.
+   hardcode_action_CXX=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+-echo "${ECHO_T}$hardcode_action_CXX" >&6
 +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
 +echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+ 
+ if test "$hardcode_action_CXX" = relink; then
+   # Fast installation is not supported
+@@ -14849,1001 +16512,176 @@
+   enable_fast_install=needless
+ fi
+ 
+-striplib=
+-old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-       else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-       ;;
+-   *)
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +
-+if test "$hardcode_action_CXX" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+
 +# The else clause should only fire when bootstrapping the
 +# libtool distribution, otherwise you forgot to ship ltmain.sh
 +# with your package, and you will get complaints that there are
@@ -32818,406 +19033,1077 @@
 +  case $lt_echo in
 +  *'\$0 --fallback-echo"')
 +    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+    ;;
-+  esac
-+
+     ;;
+   esac
+-fi
+ 
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
+-else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
 +cfgfile="$ofile"
-+
+ 
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ;;
 +  cat <<__EOF__ >> "$cfgfile"
 +# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+
+ 
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
+-   ;;
 +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
+ 
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
 +# Shell to use when invoking shell scripts.
 +SHELL=$lt_SHELL
-+
+ 
+-  darwin*)
+-  # if libdl is installed we need to link against it
+-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 +# Whether or not to build shared libraries.
 +build_libtool_libs=$enable_shared
-+
+ 
+-/* 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 dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  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_cxx_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_lib_dl_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +# Whether or not to build static libraries.
 +build_old_libs=$enable_static
-+
+ 
+-ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
 +# Whether or not to add -lc for building shared libraries.
 +build_libtool_need_lc=$archive_cmds_need_lc_CXX
-+
+ 
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
 +# Whether or not to disallow shared libs when runtime libs are static
 +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-+
+ 
+-fi
 +# Whether or not to optimize for fast installation.
 +fast_install=$enable_fast_install
-+
+ 
+-   ;;
 +# The host system.
 +host_alias=$host_alias
 +host=$host
 +host_os=$host_os
-+
+ 
+-  *)
+-    echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+-if test "${ac_cv_func_shl_load+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define shl_load innocuous_shl_load
 +# The build system.
 +build_alias=$build_alias
 +build=$build
 +build_os=$build_os
-+
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
 +# An echo program that does not interpret backslashes.
 +echo=$lt_echo
-+
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
 +# The archiver.
 +AR=$lt_AR
 +AR_FLAGS=$lt_AR_FLAGS
-+
+ 
+-#undef shl_load
 +# A C compiler.
 +LTCC=$lt_LTCC
-+
+ 
+-/* 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 shl_load ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
+-choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
 +# LTCC compiler flags.
 +LTCFLAGS=$lt_LTCFLAGS
-+
+ 
+-int
+-main ()
+-{
+-return f != shl_load;
+-  ;
+-  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_cxx_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_func_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +# A language-specific compiler.
 +CC=$lt_compiler_CXX
-+
+ 
+-ac_cv_func_shl_load=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+-if test $ac_cv_func_shl_load = yes; then
+-  lt_cv_dlopen="shl_load"
+-else
+-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 +# Is the compiler the GNU C compiler?
 +with_gcc=$GCC_CXX
-+
+ 
+-/* 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 shl_load ();
+-int
+-main ()
+-{
+-shl_load ();
+-  ;
+-  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_cxx_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_lib_dld_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +# An ERE matcher.
 +EGREP=$lt_EGREP
-+
+ 
+-ac_cv_lib_dld_shl_load=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+-if test $ac_cv_lib_dld_shl_load = yes; then
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+-else
+-  echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+-if test "${ac_cv_func_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define dlopen innocuous_dlopen
 +# The linker used to build libraries.
 +LD=$lt_LD_CXX
-+
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
 +# Whether we need hard or soft links.
 +LN_S=$lt_LN_S
-+
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
 +# A BSD-compatible nm program.
 +NM=$lt_NM
-+
+ 
+-#undef dlopen
 +# A symbol stripping program
 +STRIP=$lt_STRIP
-+
+ 
+-/* 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 dlopen ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
+-choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
 +# Used to examine libraries when file_magic_cmd begins "file"
 +MAGIC_CMD=$MAGIC_CMD
-+
+ 
+-int
+-main ()
+-{
+-return f != dlopen;
+-  ;
+-  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_cxx_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_func_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +# Used on cygwin: DLL creation program.
 +DLLTOOL="$DLLTOOL"
-+
+ 
+-ac_cv_func_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+-if test $ac_cv_func_dlopen = yes; then
+-  lt_cv_dlopen="dlopen"
+-else
+-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 +# Used on cygwin: object dumper.
 +OBJDUMP="$OBJDUMP"
-+
+ 
+-/* 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 dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  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_cxx_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_lib_dl_dlopen=yes
+-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 \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* 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 dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  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_cxx_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_lib_svld_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_svld_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+-if test $ac_cv_lib_svld_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+-else
+-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* 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 dld_link ();
+-int
+-main ()
+-{
+-dld_link ();
+-  ;
+-  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_cxx_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_lib_dld_dld_link=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_dld_dld_link=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+-if test $ac_cv_lib_dld_dld_link = yes; then
+-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-    ;;
+-  esac
+-
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
+-
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
+-
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 15486 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    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
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
+-
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
+-
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
+-  fi
+-fi
+-rm -fr conftest*
+-
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+-
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 15584 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    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
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
+-
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
+-
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self_static=no
+-  fi
+-fi
+-rm -fr conftest*
+-
+-
+-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
+-
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
+-fi
+-
+-
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # See if we are running on zsh, and set the options which allow our commands through
+-  # without removal of \ escapes.
+-  if test -n "${ZSH_VERSION+set}" ; then
+-    setopt NO_GLOB_SUBST
+-  fi
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler_CXX \
+-    CC_CXX \
+-    LD_CXX \
+-    lt_prog_compiler_wl_CXX \
+-    lt_prog_compiler_pic_CXX \
+-    lt_prog_compiler_static_CXX \
+-    lt_prog_compiler_no_builtin_flag_CXX \
+-    export_dynamic_flag_spec_CXX \
+-    thread_safe_flag_spec_CXX \
+-    whole_archive_flag_spec_CXX \
+-    enable_shared_with_static_runtimes_CXX \
+-    old_archive_cmds_CXX \
+-    old_archive_from_new_cmds_CXX \
+-    predep_objects_CXX \
+-    postdep_objects_CXX \
+-    predeps_CXX \
+-    postdeps_CXX \
+-    compiler_lib_search_path_CXX \
+-    archive_cmds_CXX \
+-    archive_expsym_cmds_CXX \
+-    postinstall_cmds_CXX \
+-    postuninstall_cmds_CXX \
+-    old_archive_from_expsyms_cmds_CXX \
+-    allow_undefined_flag_CXX \
+-    no_undefined_flag_CXX \
+-    export_symbols_cmds_CXX \
+-    hardcode_libdir_flag_spec_CXX \
+-    hardcode_libdir_flag_spec_ld_CXX \
+-    hardcode_libdir_separator_CXX \
+-    hardcode_automatic_CXX \
+-    module_cmds_CXX \
+-    module_expsym_cmds_CXX \
+-    lt_cv_prog_compiler_c_o_CXX \
+-    exclude_expsyms_CXX \
+-    include_expsyms_CXX; do
+-
+-    case $var in
+-    old_archive_cmds_CXX | \
+-    old_archive_from_new_cmds_CXX | \
+-    archive_cmds_CXX | \
+-    archive_expsym_cmds_CXX | \
+-    module_cmds_CXX | \
+-    module_expsym_cmds_CXX | \
+-    old_archive_from_expsyms_cmds_CXX | \
+-    export_symbols_cmds_CXX | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
+-
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
+-
+-cfgfile="$ofile"
+-
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+-
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+-
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_CXX
+-
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+-
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+-
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+-
+-# A C compiler.
+-LTCC=$lt_LTCC
+-
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
+-
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
+-
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+-
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
+-
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+-
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+-
+-# A symbol stripping program
+-STRIP=$STRIP
+-
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# 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
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
+ 
+ # How to create reloadable object files.
+ reload_flag=$lt_reload_flag
+@@ -15859,7 +16697,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
 +shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-+
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -15874,7 +16712,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+ 
+-# Must we lock files when doing compilation ?
 +# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_CXX
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_CXX
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_CXX
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_CXX
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_CXX
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_CXX
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_CXX
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_CXX"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_CXX
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_CXX
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
-+
-+# ### END LIBTOOL TAG CONFIG: $tagname
-+
-+__EOF__
-+
-+
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -16076,7 +16914,10 @@
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+-  test -f Makefile && make "$ltmain"
 +  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
 +  if test -f "$ltmain_in"; then
 +    test -f Makefile && make "$ltmain"
 +  fi
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC=$lt_save_CC
-+LDCXX=$LD
-+LD=$lt_save_LD
-+GCC=$lt_save_GCC
-+with_gnu_ldcxx=$with_gnu_ld
-+with_gnu_ld=$lt_save_with_gnu_ld
-+lt_cv_path_LDCXX=$lt_cv_path_LD
-+lt_cv_path_LD=$lt_save_path_LD
-+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+
-+	else
-+	  tagname=""
-+	fi
-+	;;
-+
-+      F77)
-+	if test -n "$F77" && test "X$F77" != "Xno"; then
-+
-+ac_ext=f
-+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-+
-+
-+archive_cmds_need_lc_F77=no
-+allow_undefined_flag_F77=
-+always_export_symbols_F77=no
-+archive_expsym_cmds_F77=
-+export_dynamic_flag_spec_F77=
-+hardcode_direct_F77=no
-+hardcode_libdir_flag_spec_F77=
-+hardcode_libdir_flag_spec_ld_F77=
-+hardcode_libdir_separator_F77=
-+hardcode_minus_L_F77=no
-+hardcode_automatic_F77=no
-+module_cmds_F77=
-+module_expsym_cmds_F77=
-+link_all_deplibs_F77=unknown
-+old_archive_cmds_F77=$old_archive_cmds
-+no_undefined_flag_F77=
-+whole_archive_flag_spec_F77=
-+enable_shared_with_static_runtimes_F77=no
-+
-+# Source file extension for f77 test sources.
-+ac_ext=f
-+
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+objext_F77=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="      program t\n      end\n"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
+ fi
+ 
+ 
+@@ -16148,29 +16989,55 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 +
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ 
+ 
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
@@ -33232,11 +20118,12 @@
 +$rm conftest*
 +
 +
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${F77-"f77"}
-+compiler=$CC
-+compiler_F77=$CC
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ compiler_F77=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
 +for cc_temp in $compiler""; do
 +  case $cc_temp in
 +    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
@@ -33246,8 +20133,14 @@
 +  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
@@ -33255,127 +20148,83 @@
 +
 +{ 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
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
+ test "$can_build_shared" = "no" && enable_shared=no
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
 +case $host_os in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -16178,21 +17045,21 @@
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+-aix4*)
+-  test "$enable_shared" = yes && enable_static=no
 +aix4* | aix5*)
 +  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 +    test "$enable_shared" = yes && enable_static=no
 +  fi
-+  ;;
-+esac
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5
 +echo "${ECHO_T}$enable_shared" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
+-
+-test "$ld_shlibs_F77" = no && can_build_shared=no
 +{ echo "$as_me:$LINENO: result: $enable_static" >&5
 +echo "${ECHO_T}$enable_static" >&6; }
-+
-+GCC_F77="$G77"
-+LD_F77="$LD"
-+
-+lt_prog_compiler_wl_F77=
-+lt_prog_compiler_pic_F77=
-+lt_prog_compiler_static_F77=
-+
+ 
+ GCC_F77="$G77"
+ LD_F77="$LD"
+@@ -16201,8 +17068,8 @@
+ lt_prog_compiler_pic_F77=
+ lt_prog_compiler_static_F77=
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-+
-+  if test "$GCC" = yes; then
-+    lt_prog_compiler_wl_F77='-Wl,'
-+    lt_prog_compiler_static_F77='-static'
-+
-+    case $host_os in
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static_F77='-Bstatic'
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+
-+    mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic_F77='-fno-common'
-+      ;;
-+
+ 
+   if test "$GCC" = yes; then
+     lt_prog_compiler_wl_F77='-Wl,'
+@@ -16240,6 +17107,11 @@
+       lt_prog_compiler_pic_F77='-fno-common'
+       ;;
+ 
 +    interix3*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
 +
-+    msdosdjgpp*)
-+      # Just because we use GCC doesn't mean we suddenly get shared libraries
-+      # on systems that don't support them.
-+      lt_prog_compiler_can_build_shared_F77=no
-+      enable_shared=no
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	lt_prog_compiler_pic_F77=-Kconform_pic
-+      fi
-+      ;;
-+
-+    hpux*)
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -16256,7 +17128,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
 +      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	lt_prog_compiler_pic_F77='-fPIC'
-+	;;
-+      esac
-+      ;;
-+
-+    *)
-+      lt_prog_compiler_pic_F77='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
-+    aix*)
-+      lt_prog_compiler_wl_F77='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static_F77='-Bstatic'
-+      else
-+	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -16282,6 +17154,16 @@
+ 	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
 +      darwin*)
 +        # PIC is the default on this platform
 +        # Common symbols not allowed in MH_DYLIB files
@@ -33386,47 +20235,31 @@
 +         ;;
 +       esac
 +       ;;
-+
-+    mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      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.
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -16293,7 +17175,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.
+-      case "$host_cpu" in
 +      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	lt_prog_compiler_pic_F77='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      lt_prog_compiler_wl_F77='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      lt_prog_compiler_static_F77='-non_shared'
-+      ;;
-+
-+    newsos6)
-+      lt_prog_compiler_pic_F77='-KPIC'
-+      lt_prog_compiler_static_F77='-Bstatic'
-+      ;;
-+
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -16316,13 +17198,20 @@
+       lt_prog_compiler_static_F77='-Bstatic'
+       ;;
+ 
+-    linux*)
+-      case $CC in
 +    linux* | k*bsd*-gnu)
 +      case $cc_basename in
-+      icc* | ecc*)
-+	lt_prog_compiler_wl_F77='-Wl,'
-+	lt_prog_compiler_pic_F77='-KPIC'
-+	lt_prog_compiler_static_F77='-static'
-+        ;;
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_F77='-Wl,'
+ 	lt_prog_compiler_pic_F77='-KPIC'
+ 	lt_prog_compiler_static_F77='-static'
+         ;;
 +      pgcc* | pgf77* | pgf90* | pgf95*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
@@ -33434,50 +20267,44 @@
 +	lt_prog_compiler_pic_F77='-fpic'
 +	lt_prog_compiler_static_F77='-Bstatic'
 +        ;;
-+      ccc*)
-+        lt_prog_compiler_wl_F77='-Wl,'
-+        # All Alpha code is PIC.
-+        lt_prog_compiler_static_F77='-non_shared'
-+        ;;
-+      esac
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      lt_prog_compiler_wl_F77='-Wl,'
-+      # All OSF/1 code is PIC.
-+      lt_prog_compiler_static_F77='-non_shared'
-+      ;;
-+
-+    solaris*)
-+      lt_prog_compiler_pic_F77='-KPIC'
-+      lt_prog_compiler_static_F77='-Bstatic'
+       ccc*)
+         lt_prog_compiler_wl_F77='-Wl,'
+         # All Alpha code is PIC.
+@@ -16337,15 +17226,15 @@
+       lt_prog_compiler_static_F77='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      lt_prog_compiler_pic_F77='-Kpic'
+-      lt_prog_compiler_static_F77='-dn'
+-      ;;
+-
+     solaris*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+       lt_prog_compiler_pic_F77='-KPIC'
+       lt_prog_compiler_static_F77='-Bstatic'
 +      case $cc_basename in
 +      f77* | f90* | f95*)
 +	lt_prog_compiler_wl_F77='-Qoption ld ';;
 +      *)
 +	lt_prog_compiler_wl_F77='-Wl,';;
 +      esac
-+      ;;
-+
-+    sunos4*)
-+      lt_prog_compiler_wl_F77='-Qoption ld '
-+      lt_prog_compiler_pic_F77='-PIC'
-+      lt_prog_compiler_static_F77='-Bstatic'
-+      ;;
-+
+       ;;
+ 
+     sunos4*)
+@@ -16354,7 +17243,7 @@
+       lt_prog_compiler_static_F77='-Bstatic'
+       ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      lt_prog_compiler_wl_F77='-Wl,'
-+      lt_prog_compiler_pic_F77='-KPIC'
-+      lt_prog_compiler_static_F77='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_prog_compiler_pic_F77='-Kconform_pic'
-+	lt_prog_compiler_static_F77='-Bstatic'
-+      fi
-+      ;;
-+
+       lt_prog_compiler_wl_F77='-Wl,'
+       lt_prog_compiler_pic_F77='-KPIC'
+       lt_prog_compiler_static_F77='-Bstatic'
+@@ -16367,6 +17256,17 @@
+       fi
+       ;;
+ 
 +    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +      lt_prog_compiler_wl_F77='-Wl,'
 +      lt_prog_compiler_pic_F77='-KPIC'
@@ -33489,84 +20316,81 @@
 +      lt_prog_compiler_can_build_shared_F77=no
 +      ;;
 +
-+    uts4*)
-+      lt_prog_compiler_pic_F77='-pic'
-+      lt_prog_compiler_static_F77='-Bstatic'
-+      ;;
-+
-+    *)
-+      lt_prog_compiler_can_build_shared_F77=no
-+      ;;
-+    esac
-+  fi
-+
+     uts4*)
+       lt_prog_compiler_pic_F77='-pic'
+       lt_prog_compiler_static_F77='-Bstatic'
+@@ -16378,16 +17278,16 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic_F77"; then
-+
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_F77"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-+if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_prog_compiler_pic_works_F77=no
-+  ac_outfile=conftest.$ac_objext
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic_F77"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # 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 \
+ if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16401,26 +17301,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 \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16407: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:17307: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16411: \$? = $ac_status" >&5
 +   echo "$as_me:17311: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
+    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
+-     if test ! -s conftest.err; then
 +     # So say no if there are warnings other than the usual output.
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
 +     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_prog_compiler_pic_works_F77=yes
-+     fi
-+   fi
-+   $rm conftest*
-+
-+fi
+        lt_prog_compiler_pic_works_F77=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
-+
-+if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-+    case $lt_prog_compiler_pic_F77 in
-+     "" | " "*) ;;
-+     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-+     esac
-+else
-+    lt_prog_compiler_pic_F77=
-+     lt_prog_compiler_can_build_shared_F77=no
-+fi
-+
-+fi
+ 
+ if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+     case $lt_prog_compiler_pic_F77 in
+@@ -16433,7 +17335,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
 +case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic_F77=
-+    ;;
-+  *)
-+    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-+    ;;
-+esac
-+
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic_F77=
+@@ -16443,8 +17345,50 @@
+     ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -33611,116 +20435,103 @@
 +
 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_prog_compiler_c_o_F77=no
-+   $rm -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
+ if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16455,60 +17399,58 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16474: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:17411: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16478: \$? = $ac_status" >&5
 +   echo "$as_me:17415: \$? = $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
-+     # So say no if there are warnings
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
 +     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
 +     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o_F77=yes
-+     fi
-+   fi
+        lt_cv_prog_compiler_c_o_F77=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
 +   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
 +   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
 +   $rm out/* && rmdir out
-+   cd ..
-+   rmdir conftest
-+   $rm conftest*
-+
-+fi
+    cd ..
+    rmdir conftest
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
-+
-+
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
+ 
+ 
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
 +  { echo "$as_me:$LINENO: result: $hard_links" >&5
 +echo "${ECHO_T}$hard_links" >&6; }
-+  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;}
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
+   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;}
+@@ -16518,8 +17460,8 @@
+   need_locks=no
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-+
-+  runpath_var=
-+  allow_undefined_flag_F77=
-+  enable_shared_with_static_runtimes_F77=no
-+  archive_cmds_F77=
-+  archive_expsym_cmds_F77=
-+  old_archive_From_new_cmds_F77=
-+  old_archive_from_expsyms_cmds_F77=
-+  export_dynamic_flag_spec_F77=
-+  whole_archive_flag_spec_F77=
-+  thread_safe_flag_spec_F77=
-+  hardcode_libdir_flag_spec_F77=
-+  hardcode_libdir_flag_spec_ld_F77=
-+  hardcode_libdir_separator_F77=
-+  hardcode_direct_F77=no
-+  hardcode_minus_L_F77=no
-+  hardcode_shlibpath_var_F77=unsupported
-+  link_all_deplibs_F77=unknown
-+  hardcode_automatic_F77=no
-+  module_cmds_F77=
-+  module_expsym_cmds_F77=
-+  always_export_symbols_F77=no
-+  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  include_expsyms_F77=
-+  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
-+  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+  # platforms (ab)use it in PIC code, but their linkers get confused if
-+  # the symbol is explicitly referenced.  Since portable code cannot
-+  # rely on this symbol name, it's probably fine to never include it in
-+  # preloaded symbol tables.
-+  extract_expsyms_cmds=
+ 
+   runpath_var=
+   allow_undefined_flag_F77=
+@@ -16557,6 +17499,16 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
 +  # Just being paranoid about ensuring that cc_basename is set.
 +  for cc_temp in $compiler""; do
 +  case $cc_temp in
@@ -33731,30 +20542,24 @@
 +  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+@@ -16567,6 +17519,10 @@
+       with_gnu_ld=no
+     fi
+     ;;
 +  interix*)
 +    # we just hope/assume this is gcc and not c89 (= MSVC++)
 +    with_gnu_ld=yes
 +    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+  esac
-+
-+  ld_shlibs_F77=yes
-+  if test "$with_gnu_ld" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
-+
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+@@ -16577,6 +17533,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
@@ -33776,70 +20581,43 @@
 +      *) supports_anon_versioning=yes ;;
 +    esac
 +
-+    # See if GNU ld supports shared libraries.
-+    case $host_os in
-+    aix3* | aix4* | aix5*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+	ld_shlibs_F77=no
-+	cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+      hardcode_libdir_flag_spec_F77='-L$libdir'
-+      hardcode_minus_L_F77=yes
-+
-+      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
-+      # that the semantics of dynamic libraries on AmigaOS, at least up
-+      # to version 4, is to share data among multiple programs linked
-+      # with the same dynamic library.  Since this doesn't match the
-+      # behavior of shared libraries on other platforms, we can't use
-+      # them.
-+      ld_shlibs_F77=no
-+      ;;
-+
-+    beos*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	allow_undefined_flag_F77=unsupported
-+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -16614,7 +17591,7 @@
+ 	allow_undefined_flag_F77=unsupported
+ 	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds_F77='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
 +	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	ld_shlibs_F77=no
-+      fi
-+      ;;
-+
-+    cygwin* | mingw* | pw32*)
-+      # _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'
+       else
+ 	ld_shlibs_F77=no
+       fi
+@@ -16624,13 +17601,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'
+-      allow_undefined_flag_F77=no
 +      allow_undefined_flag_F77=unsupported
-+      always_export_symbols_F77=no
-+      enable_shared_with_static_runtimes_F77=yes
+       always_export_symbols_F77=no
+       enable_shared_with_static_runtimes_F77=yes
+-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 +      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+
-+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 +        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# 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
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
+ 	# 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
+@@ -16639,23 +17616,70 @@
+ 	  echo EXPORTS > $output_objdir/$soname.def;
+ 	  cat $export_symbols >> $output_objdir/$soname.def;
+ 	fi~
+-	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      else
+       else
+-	ld_shlibs=no
 +	ld_shlibs_F77=no
 +      fi
 +      ;;
@@ -33888,40 +20666,40 @@
 +	link_all_deplibs_F77=no
 +      else
 +	ld_shlibs_F77=no
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    solaris* | sysv5*)
 +    solaris*)
-+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+	ld_shlibs_F77=no
-+	cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs_F77=no
+ 	cat <<EOF 1>&2
+@@ -16669,13 +17693,40 @@
+ 
+ EOF
+       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs_F77=no
-+      fi
-+      ;;
-+
+       else
+ 	ld_shlibs_F77=no
+       fi
+       ;;
+ 
 +    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 +      case `$LD -v 2>&1` in
 +        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
@@ -33949,62 +20727,55 @@
 +      esac
 +      ;;
 +
-+    sunos4*)
-+      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      hardcode_direct_F77=yes
-+      hardcode_shlibpath_var_F77=no
-+      ;;
-+
-+    *)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+     sunos4*)
+       archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+@@ -16685,24 +17736,19 @@
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs_F77=no
-+      fi
-+      ;;
-+    esac
-+
+       else
+ 	ld_shlibs_F77=no
+       fi
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs_F77" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec_F77=
+-      fi
 +    if test "$ld_shlibs_F77" = no; then
 +      runpath_var=
 +      hardcode_libdir_flag_spec_F77=
 +      export_dynamic_flag_spec_F77=
 +      whole_archive_flag_spec_F77=
-+    fi
-+  else
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      allow_undefined_flag_F77=unsupported
-+      always_export_symbols_F77=yes
-+      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      hardcode_minus_L_F77=yes
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -16714,7 +17760,7 @@
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       hardcode_minus_L_F77=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
 +      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	hardcode_direct_F77=unsupported
-+      fi
-+      ;;
-+
-+    aix4* | aix5*)
-+      if test "$host_cpu" = ia64; then
-+	# On IA64, the linker does run time linking by default, so we don't
-+	# have to do anything special.
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	hardcode_direct_F77=unsupported
+@@ -16736,9 +17782,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
 +	aix_use_runtimelinking=no
-+	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
-+      else
-+	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+	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
-+	aix_use_runtimelinking=no
 +
 +	# Test if we are trying to use run time linking or normal
 +	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -34018,77 +20789,69 @@
 +	  done
 +	  ;;
 +	esac
-+
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
-+
-+      # When large executables or shared objects are built, AIX ld can
-+      # have problems creating the table of contents.  If linking a library
-+      # or program results in "error TOC overflow" add -mminimal-toc to
-+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+      archive_cmds_F77=''
-+      hardcode_direct_F77=yes
-+      hardcode_libdir_separator_F77=':'
-+      link_all_deplibs_F77=yes
-+
-+      if test "$GCC" = yes; then
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+@@ -16755,7 +17813,7 @@
+       link_all_deplibs_F77=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.012|aix4.012.*)
 +	case $host_os in aix4.[012]|aix4.[012].*)
-+	# 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`
-+	  if test -f "$collect2name" && \
-+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	  then
-+  	  # We have reworked collect2
-+  	  hardcode_direct_F77=yes
-+	  else
-+  	  # We have old collect2
-+  	  hardcode_direct_F77=unsupported
-+  	  # It fails to find uninstalled libraries when the uninstalled
-+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+  	  # to unsupported forces relinking
-+  	  hardcode_minus_L_F77=yes
-+  	  hardcode_libdir_flag_spec_F77='-L$libdir'
-+  	  hardcode_libdir_separator_F77=
-+	  fi
+ 	# 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`
+@@ -16774,8 +17832,12 @@
+   	  hardcode_libdir_flag_spec_F77='-L$libdir'
+   	  hardcode_libdir_separator_F77=
+ 	  fi
 +	  ;;
-+	esac
-+	shared_flag='-shared'
+ 	esac
+ 	shared_flag='-shared'
 +	if test "$aix_use_runtimelinking" = yes; then
 +	  shared_flag="$shared_flag "'${wl}-G'
 +	fi
-+      else
-+	# not using gcc
-+	if test "$host_cpu" = ia64; then
-+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+  	# chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+	else
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -16783,48 +17845,45 @@
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
 +	  if test "$aix_use_runtimelinking" = yes; then
 +	    shared_flag='${wl}-G'
-+	  else
+ 	  else
+-	    shared_flag='-qmkshrobj'
+-  	fi
 +	    shared_flag='${wl}-bM:SRE'
 +	  fi
-+	fi
-+      fi
-+
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      always_export_symbols_F77=no
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      always_export_symbols_F77=yes
-+      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.
-+	allow_undefined_flag_F77='-berok'
-+       # Determine the default libpath from the value encoded in an empty executable.
+       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.
+ 	allow_undefined_flag_F77='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
 +       cat >conftest.$ac_ext <<_ACEOF
-+      program main
-+
-+      end
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+       program main
+ 
+       end
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -34096,48 +20859,65 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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; }
+ }'`
+@@ -16835,19 +17894,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
 +	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+       else
-+	if test "$host_cpu" = ia64; then
-+	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-+	  allow_undefined_flag_F77="-z nodefs"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
+ 	  allow_undefined_flag_F77="-z nodefs"
+-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
 +	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+	else
-+	 # Determine the default libpath from the value encoded in an empty executable.
-+	 cat >conftest.$ac_ext <<_ACEOF
-+      program main
-+
-+      end
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 cat >conftest.$ac_ext <<_ACEOF
+@@ -16856,27 +17916,23 @@
+       end
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -34145,81 +20925,115 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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; }
+ }'`
+@@ -16887,8 +17943,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	  # Warning - without using the other run time loading flags,
-+	  # -berok will link without error, but may produce a broken library.
-+	  no_undefined_flag_F77=' ${wl}-bernotok'
-+	  allow_undefined_flag_F77=' ${wl}-berok'
-+	  # Exported symbols can be pulled into shared objects from archives
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -16897,13 +17955,11 @@
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  no_undefined_flag_F77=' ${wl}-bernotok'
+ 	  allow_undefined_flag_F77=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  always_export_symbols_F77=yes
+ 	  # Exported symbols can be pulled into shared objects from archives
+-	  whole_archive_flag_spec_F77=' '
 +	  whole_archive_flag_spec_F77='$convenience'
-+	  archive_cmds_need_lc_F77=yes
+ 	  archive_cmds_need_lc_F77=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	fi
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+      hardcode_libdir_flag_spec_F77='-L$libdir'
-+      hardcode_minus_L_F77=yes
-+      # see comment about different semantics on the GNU ld section
-+      ld_shlibs_F77=no
-+      ;;
-+
+ 	fi
+       fi
+       ;;
+@@ -16916,7 +17972,7 @@
+       ld_shlibs_F77=no
+       ;;
+ 
+-    bsdi4*)
 +    bsdi[45]*)
-+      export_dynamic_flag_spec_F77=-rdynamic
-+      ;;
-+
-+    cygwin* | mingw* | pw32*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      hardcode_libdir_flag_spec_F77=' '
+       export_dynamic_flag_spec_F77=-rdynamic
+       ;;
+ 
+@@ -16926,68 +17982,68 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       hardcode_libdir_flag_spec_F77=' '
+-      allow_undefined_flag_F77=no
 +      allow_undefined_flag_F77=unsupported
-+      # Tell ltmain to make .lib files, not .a files.
-+      libext=lib
-+      # Tell ltmain to make .dll files, not .so files.
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
 +      shrext_cmds=".dll"
-+      # FIXME: Setting linknames here is a bad hack.
+       # FIXME: Setting linknames here is a bad hack.
+-      archive_cmds_F77='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
 +      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      old_archive_From_new_cmds_F77='true'
-+      # FIXME: Should let the user specify the lib program.
-+      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+       # The linker will automatically build a .lib file if we build a DLL.
+       old_archive_From_new_cmds_F77='true'
+       # FIXME: Should let the user specify the lib program.
+       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
 +      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-+      enable_shared_with_static_runtimes_F77=yes
-+      ;;
-+
-+    darwin* | rhapsody*)
+       enable_shared_with_static_runtimes_F77=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc_F77=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
+-	allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.012)
+-	      allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
 +      case $host_os in
 +        rhapsody* | darwin1.[012])
 +         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
@@ -34238,13 +21052,32 @@
 +           esac
 +         fi
 +         ;;
-+      esac
+       esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-      fi
+-      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +      archive_cmds_need_lc_F77=no
-+      hardcode_direct_F77=no
-+      hardcode_automatic_F77=yes
-+      hardcode_shlibpath_var_F77=unsupported
+       hardcode_direct_F77=no
+       hardcode_automatic_F77=yes
+       hardcode_shlibpath_var_F77=unsupported
+-      whole_archive_flag_spec_F77='-all_load $convenience'
 +      whole_archive_flag_spec_F77=''
-+      link_all_deplibs_F77=yes
+       link_all_deplibs_F77=yes
 +    if test "$GCC" = yes ; then
 +    	output_verbose_link_cmd='echo'
 +        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
@@ -34252,7 +21085,8 @@
 +      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 +      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    else
+     else
+-      ld_shlibs_F77=no
 +      case $cc_basename in
 +        xlc*)
 +         output_verbose_link_cmd='echo'
@@ -34266,64 +21100,39 @@
 +         ld_shlibs_F77=no
 +          ;;
 +      esac
-+    fi
-+      ;;
-+
-+    dgux*)
-+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec_F77='-L$libdir'
-+      hardcode_shlibpath_var_F77=no
-+      ;;
-+
-+    freebsd1*)
-+      ld_shlibs_F77=no
-+      ;;
-+
-+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+    # support.  Future versions do this automatically, but an explicit c++rt0.o
-+    # does not break anything, and helps significantly (at the cost of a little
-+    # extra space).
-+    freebsd2.2*)
-+      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      hardcode_libdir_flag_spec_F77='-R$libdir'
-+      hardcode_direct_F77=yes
-+      hardcode_shlibpath_var_F77=no
-+      ;;
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct_F77=yes
-+      hardcode_minus_L_F77=yes
-+      hardcode_shlibpath_var_F77=no
-+      ;;
-+
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+     fi
+       ;;
+ 
+@@ -17021,8 +18077,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
 +    freebsd* | dragonfly*)
 +      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec_F77='-R$libdir'
-+      hardcode_direct_F77=yes
-+      hardcode_shlibpath_var_F77=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
+       hardcode_libdir_flag_spec_F77='-R$libdir'
+       hardcode_direct_F77=yes
+       hardcode_shlibpath_var_F77=no
+@@ -17030,7 +18086,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 +	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      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
-+      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_separator_F77=:
-+      hardcode_direct_F77=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      hardcode_minus_L_F77=yes
-+      export_dynamic_flag_spec_F77='${wl}-E'
-+      ;;
-+
+       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
+@@ -17044,47 +18100,62 @@
+       export_dynamic_flag_spec_F77='${wl}-E'
+       ;;
+ 
+-    hpux10* | hpux11*)
 +    hpux10*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -34349,153 +21158,160 @@
 +	  ;;
 +	ia64*)
 +	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
+ 	  ;;
+ 	*)
+-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
 +	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      else
+ 	  ;;
+ 	esac
+       else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	case $host_cpu in
 +	hppa*64*)
 +	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
 +	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
+ 	  ;;
+ 	*)
+-	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 +	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      fi
-+      if test "$with_gnu_ld" = no; then
+ 	  ;;
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_separator_F77=:
 +
 +	case $host_cpu in
 +	hppa*64*|ia64*)
-+	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-+	  hardcode_direct_F77=no
-+	  hardcode_shlibpath_var_F77=no
-+	  ;;
-+	*)
-+	  hardcode_direct_F77=yes
-+	  export_dynamic_flag_spec_F77='${wl}-E'
-+
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  hardcode_minus_L_F77=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
+ 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+-	  hardcode_libdir_separator_F77=:
+-	  hardcode_direct_F77=no
+-	  hardcode_shlibpath_var_F77=no
+-	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_F77='-L$libdir'
+ 	  hardcode_direct_F77=no
+ 	  hardcode_shlibpath_var_F77=no
+-
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L_F77=yes
+ 	  ;;
+ 	*)
+-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_separator_F77=:
+ 	  hardcode_direct_F77=yes
+ 	  export_dynamic_flag_spec_F77='${wl}-E'
+ 
+@@ -17098,7 +18169,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      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'
-+      fi
-+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator_F77=:
-+      link_all_deplibs_F77=yes
-+      ;;
-+
+       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'
+@@ -17108,7 +18179,7 @@
+       link_all_deplibs_F77=yes
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      hardcode_libdir_flag_spec_F77='-R$libdir'
-+      hardcode_direct_F77=yes
-+      hardcode_shlibpath_var_F77=no
-+      ;;
-+
-+    newsos6)
-+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct_F77=yes
-+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator_F77=:
-+      hardcode_shlibpath_var_F77=no
-+      ;;
-+
-+    openbsd*)
-+      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
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -17131,7 +18202,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
+-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+	export_dynamic_flag_spec_F77='${wl}-E'
-+      else
-+       case $host_os in
-+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	   hardcode_libdir_flag_spec_F77='-R$libdir'
-+	   ;;
-+	 *)
+ 	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+ 	export_dynamic_flag_spec_F77='${wl}-E'
+       else
+@@ -17141,7 +18213,7 @@
+ 	   hardcode_libdir_flag_spec_F77='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+	   ;;
-+       esac
-+      fi
-+      ;;
-+
-+    os2*)
-+      hardcode_libdir_flag_spec_F77='-L$libdir'
-+      hardcode_minus_L_F77=yes
-+      allow_undefined_flag_F77=unsupported
+ 	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -17152,14 +18224,14 @@
+       hardcode_libdir_flag_spec_F77='-L$libdir'
+       hardcode_minus_L_F77=yes
+       allow_undefined_flag_F77=unsupported
+-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
 +      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
-+
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+       old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      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'
-+      fi
-+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator_F77=:
-+      ;;
-+
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+       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'
+@@ -17171,13 +18243,13 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+      else
-+	allow_undefined_flag_F77=' -expect_unresolved \*'
-+	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+ 	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+       else
+ 	allow_undefined_flag_F77=' -expect_unresolved \*'
+ 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
 +	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+	# Both c and cxx compiler support -rpath directly
-+	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-+      fi
-+      hardcode_libdir_separator_F77=:
-+      ;;
-+
-+    solaris*)
-+      no_undefined_flag_F77=' -z text'
-+      if test "$GCC" = yes; then
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
+@@ -17185,21 +18257,15 @@
+       hardcode_libdir_separator_F77=:
+       ;;
+ 
+-    sco3.2v5*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_F77=no
+-      export_dynamic_flag_spec_F77='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+-
+     solaris*)
+       no_undefined_flag_F77=' -z text'
+       if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	wlarc='${wl}'
 +	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-+      else
+       else
 +	wlarc=''
-+	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'
-+      fi
-+      hardcode_libdir_flag_spec_F77='-R$libdir'
-+      hardcode_shlibpath_var_F77=no
-+      case $host_os in
-+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+ 	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'
+@@ -17208,8 +18274,18 @@
+       hardcode_shlibpath_var_F77=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
 +      *)
 + 	# The compiler driver will combine linker options so we
 + 	# cannot just pass the convience library names through
@@ -34508,77 +21324,58 @@
 + 	*)
 + 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
 + 	esac ;;
-+      esac
-+      link_all_deplibs_F77=yes
-+      ;;
-+
-+    sunos4*)
-+      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.
+       esac
+       link_all_deplibs_F77=yes
+       ;;
+@@ -17218,7 +18294,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.
+-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      hardcode_libdir_flag_spec_F77='-L$libdir'
-+      hardcode_direct_F77=yes
-+      hardcode_minus_L_F77=yes
-+      hardcode_shlibpath_var_F77=no
-+      ;;
-+
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct_F77=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  reload_cmds_F77='$CC -r -o $output$reload_objs'
-+	  hardcode_direct_F77=no
-+        ;;
-+	motorola)
-+	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      hardcode_shlibpath_var_F77=no
-+      ;;
-+
-+    sysv4.3*)
-+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var_F77=no
-+      export_dynamic_flag_spec_F77='-Bexport'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_shlibpath_var_F77=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	ld_shlibs_F77=yes
-+      fi
-+      ;;
-+
+       else
+ 	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -17266,36 +18342,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_F77=yes
+-      hardcode_minus_L_F77=no
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
 +      no_undefined_flag_F77='${wl}-z,text'
 +      archive_cmds_need_lc_F77=no
-+      hardcode_shlibpath_var_F77=no
+       hardcode_shlibpath_var_F77=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
 +      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag_F77='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
+       else
+-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
+       fi
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var_F77=no
+       ;;
+ 
+-    sysv5*)
+-      no_undefined_flag_F77=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      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'
+-      hardcode_libdir_flag_spec_F77=
 +    sysv5* | sco3.2v5* | sco5v6*)
 +      # Note: We can NOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
@@ -34589,12 +21386,12 @@
 +      no_undefined_flag_F77='${wl}-z,text'
 +      allow_undefined_flag_F77='${wl}-z,nodefs'
 +      archive_cmds_need_lc_F77=no
-+      hardcode_shlibpath_var_F77=no
+       hardcode_shlibpath_var_F77=no
 +      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
 +      hardcode_libdir_separator_F77=':'
 +      link_all_deplibs_F77=yes
 +      export_dynamic_flag_spec_F77='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
+       runpath_var='LD_RUN_PATH'
 +
 +      if test "$GCC" = yes; then
 +	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -34603,102 +21400,77 @@
 +	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
-+      ;;
-+
-+    uts4*)
-+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec_F77='-L$libdir'
-+      hardcode_shlibpath_var_F77=no
-+      ;;
-+
-+    *)
-+      ld_shlibs_F77=no
-+      ;;
-+    esac
-+  fi
-+
+       ;;
+ 
+     uts4*)
+@@ -17310,15 +18395,10 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+-echo "${ECHO_T}$ld_shlibs_F77" >&6
 +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
 +echo "${ECHO_T}$ld_shlibs_F77" >&6; }
-+test "$ld_shlibs_F77" = no && can_build_shared=no
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc_F77" in
-+x|xyes)
-+  # Assume -lc should be added
-+  archive_cmds_need_lc_F77=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $archive_cmds_F77 in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-+      ;;
-+    '$CC '*)
-+      # 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.
+ test "$ld_shlibs_F77" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -17336,8 +18416,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.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
 +      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-+      $rm conftest*
-+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl_F77
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+@@ -17351,6 +18431,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl_F77
 +	pic_flag=$lt_prog_compiler_pic_F77
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-+        allow_undefined_flag_F77=
-+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+        then
-+	  archive_cmds_need_lc_F77=no
-+        else
-+	  archive_cmds_need_lc_F77=yes
-+        fi
-+        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $rm conftest*
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -17373,20 +18454,20 @@
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
 +      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
-+
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
 +shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -17396,7 +18477,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +if test "$GCC" = yes; then
 +  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 +  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
@@ -34713,184 +21485,82 @@
 +else
 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[01] | aix4.[01].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-+      ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -17461,7 +18555,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
 +  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
+   ;;
+ 
+ beos*)
+@@ -17470,7 +18564,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
 +bsdi[45]*)
-+  version_type=linux
-+  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 $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17486,7 +18580,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
 +  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
-+
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -17498,7 +18592,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
 +      $install_prog $dir/$dlname \$dldir/$dlname~
 +      chmod a+x \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-+    mingw*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -17528,7 +18623,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
 +      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    esac
-+    ;;
-+
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
+       ;;
+     esac
+     ;;
+@@ -17551,7 +18646,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+  if test "$GCC" = yes; then
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+  else
-+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
-+
-+dgux*)
-+  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
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
+   # 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"`
+@@ -17574,20 +18669,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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='GNU ld.so'
+-  ;;
+-
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
@@ -34902,95 +21572,65 @@
 +    *) objformat=elf ;;
 +    esac
 +  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -17605,14 +18697,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
 +  freebsd3.[01]* | freebsdelf3.[01]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
 +  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
 +  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
 +  freebsd*) # from 4.6 on
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
-+  esac
-+  ;;
-+
-+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
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
+   esac
+   ;;
+ 
+@@ -17632,9 +18729,9 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  case "$host_cpu" in
 +  case $host_cpu in
-+  ia64*)
+   ia64*)
+-    shrext='.so'
 +    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+   hppa*64*)
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -17649,7 +18746,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
 +     shrext_cmds='.sl'
-+     hardcode_into_libs=yes
-+     dynamic_linker="$host_os dld.sl"
-+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+     soname_spec='${libname}${release}${shared_ext}$major'
-+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+     ;;
-+   *)
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -17660,7 +18757,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
 +    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    ;;
-+  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -17672,6 +18769,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
 +interix3*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -35003,78 +21643,50 @@
 +  hardcode_into_libs=yes
 +  ;;
 +
-+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.
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -17715,29 +18824,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'
-+  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
-+
+   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'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+   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
+ 
 +  # 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,
-+  # 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'
-+  ;;
-+
+   # 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,
+@@ -17747,6 +18853,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -35087,145 +21699,69 @@
 +  dynamic_linker='NetBSD ld.elf_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
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -17756,7 +18874,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}'
 +    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
-+  ;;
-+
-+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
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -17784,8 +18902,13 @@
+ 
+ openbsd*)
+   version_type=sunos
 +  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
+   need_lib_prefix=no
+-  need_version=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
-+  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'
+   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
+@@ -17805,7 +18928,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
 +  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*)
-+  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"
-+  ;;
-+
-+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'
-+  ;;
-+
-+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
-+  ;;
-+
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -17823,13 +18946,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  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
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -17855,7 +18971,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +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
-+  ;;
-+
-+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
-+  ;;
-+
+   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'
+@@ -17888,6 +19004,29 @@
+   fi
+   ;;
+ 
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -35249,21 +21785,21 @@
 +  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
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17899,16 +19038,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 +echo "${ECHO_T}$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
-+
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
+-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
 +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"
@@ -35271,492 +21807,162 @@
 +
 +{ 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_F77=
-+if test -n "$hardcode_libdir_flag_spec_F77" || \
+ hardcode_action_F77=
+ if test -n "$hardcode_libdir_flag_spec_F77" || \
+-   test -n "$runpath_var F77" || \
+-   test "X$hardcode_automatic_F77"="Xyes" ; then
 +   test -n "$runpath_var_F77" || \
 +   test "X$hardcode_automatic_F77" = "Xyes" ; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct_F77" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-+     test "$hardcode_minus_L_F77" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action_F77=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action_F77=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action_F77=unsupported
-+fi
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct_F77" != no &&
+@@ -17928,8 +19072,8 @@
+   # directories.
+   hardcode_action_F77=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+-echo "${ECHO_T}$hardcode_action_F77" >&6
 +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
 +echo "${ECHO_T}$hardcode_action_F77" >&6; }
-+
-+if test "$hardcode_action_F77" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  # See if we are running on zsh, and set the options which allow our commands through
-+  # without removal of \ escapes.
-+  if test -n "${ZSH_VERSION+set}" ; then
-+    setopt NO_GLOB_SUBST
-+  fi
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
+ 
+ if test "$hardcode_action_F77" = relink; then
+   # Fast installation is not supported
+@@ -17940,36 +19084,6 @@
+   enable_fast_install=needless
+ fi
+ 
+-striplib=
+-old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-       else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-       ;;
+-   *)
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-    ;;
+-  esac
+-fi
+-
+-
+ 
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -17984,7 +19098,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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
 +  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
 +    SED SHELL STRIP \
-+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+    deplibs_check_method reload_flag reload_cmds need_locks \
-+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+    lt_cv_sys_global_symbol_to_c_name_address \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    old_postinstall_cmds old_postuninstall_cmds \
-+    compiler_F77 \
-+    CC_F77 \
-+    LD_F77 \
-+    lt_prog_compiler_wl_F77 \
-+    lt_prog_compiler_pic_F77 \
-+    lt_prog_compiler_static_F77 \
-+    lt_prog_compiler_no_builtin_flag_F77 \
-+    export_dynamic_flag_spec_F77 \
-+    thread_safe_flag_spec_F77 \
-+    whole_archive_flag_spec_F77 \
-+    enable_shared_with_static_runtimes_F77 \
-+    old_archive_cmds_F77 \
-+    old_archive_from_new_cmds_F77 \
-+    predep_objects_F77 \
-+    postdep_objects_F77 \
-+    predeps_F77 \
-+    postdeps_F77 \
-+    compiler_lib_search_path_F77 \
-+    archive_cmds_F77 \
-+    archive_expsym_cmds_F77 \
-+    postinstall_cmds_F77 \
-+    postuninstall_cmds_F77 \
-+    old_archive_from_expsyms_cmds_F77 \
-+    allow_undefined_flag_F77 \
-+    no_undefined_flag_F77 \
-+    export_symbols_cmds_F77 \
-+    hardcode_libdir_flag_spec_F77 \
-+    hardcode_libdir_flag_spec_ld_F77 \
-+    hardcode_libdir_separator_F77 \
-+    hardcode_automatic_F77 \
-+    module_cmds_F77 \
-+    module_expsym_cmds_F77 \
-+    lt_cv_prog_compiler_c_o_F77 \
-+    exclude_expsyms_F77 \
-+    include_expsyms_F77; do
-+
-+    case $var in
-+    old_archive_cmds_F77 | \
-+    old_archive_from_new_cmds_F77 | \
-+    archive_cmds_F77 | \
-+    archive_expsym_cmds_F77 | \
-+    module_cmds_F77 | \
-+    module_expsym_cmds_F77 | \
-+    old_archive_from_expsyms_cmds_F77 | \
-+    export_symbols_cmds_F77 | \
-+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  case $lt_echo in
-+  *'\$0 --fallback-echo"')
-+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+    ;;
-+  esac
-+
-+cfgfile="$ofile"
-+
-+  cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_F77
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
+     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 \
+@@ -18084,6 +19199,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
 +host_os=$host_os
 +
 +# The build system.
 +build_alias=$build_alias
 +build=$build
 +build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -18095,6 +19216,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
 +# LTCC compiler flags.
 +LTCFLAGS=$lt_LTCFLAGS
 +
-+# A language-specific compiler.
-+CC=$lt_compiler_F77
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_F77
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_LD_F77
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
+ # A language-specific compiler.
+ CC=$lt_compiler_F77
+ 
+@@ -18114,7 +19238,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
 +STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_F77
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -18145,7 +19269,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
 +shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_F77
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-+
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -18160,7 +19284,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+ 
+-# Must we lock files when doing compilation ?
 +# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_F77
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_F77
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_F77
-+archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_F77
-+module_expsym_cmds=$lt_module_expsym_cmds_F77
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_F77
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_F77
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_F77
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_F77
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_F77
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_F77
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_F77
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_F77
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_F77
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_F77
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_F77
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_F77"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_F77
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_F77
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_F77
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_F77
-+
-+# ### END LIBTOOL TAG CONFIG: $tagname
-+
-+__EOF__
-+
-+
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -18362,7 +19486,10 @@
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+-  test -f Makefile && make "$ltmain"
 +  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
 +  if test -f "$ltmain_in"; then
 +    test -f Makefile && make "$ltmain"
 +  fi
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC="$lt_save_CC"
-+
-+	else
-+	  tagname=""
-+	fi
-+	;;
-+
-+      GCJ)
-+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-+
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+objext_GCJ=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}\n"
-+
-+# Code to be used in simple link tests
+ fi
+ 
+ 
+@@ -18383,7 +19510,6 @@
+ 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+ 
+ 
+-
+ # Source file extension for Java test sources.
+ ac_ext=java
+ 
+@@ -18395,26 +19521,55 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
 +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 +
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ 
+ 
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
@@ -35771,11 +21977,11 @@
 +$rm conftest*
 +
 +
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${GCJ-"gcj"}
-+compiler=$CC
-+compiler_GCJ=$CC
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ compiler_GCJ=$CC
 +for cc_temp in $compiler""; do
 +  case $cc_temp in
 +    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
@@ -35786,159 +21992,98 @@
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +
-+
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+archive_cmds_need_lc_GCJ=no
-+
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ archive_cmds_need_lc_GCJ=no
+ 
 +old_archive_cmds_GCJ=$old_archive_cmds
 +
-+## 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
-+## what you are doing...
-+
-+lt_prog_compiler_no_builtin_flag_GCJ=
-+
-+if test "$GCC" = yes; then
-+  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-+
-+
+ ## 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
+@@ -18426,8 +19581,8 @@
+   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+ 
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_prog_compiler_rtti_exceptions=no
-+  ac_outfile=conftest.$ac_objext
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="-fno-rtti -fno-exceptions"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # 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 \
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18441,26 +19596,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 \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18447: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:19602: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18451: \$? = $ac_status" >&5
 +   echo "$as_me:19606: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
+    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
+-     if test ! -s conftest.err; then
 +     # So say no if there are warnings other than the usual output.
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
 +     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_rtti_exceptions=yes
-+     fi
-+   fi
-+   $rm conftest*
-+
-+fi
+        lt_cv_prog_compiler_rtti_exceptions=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+
-+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"
-+else
-+    :
-+fi
-+
-+fi
-+
-+lt_prog_compiler_wl_GCJ=
-+lt_prog_compiler_pic_GCJ=
-+lt_prog_compiler_static_GCJ=
-+
+ 
+ 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"
+@@ -18474,8 +19631,8 @@
+ lt_prog_compiler_pic_GCJ=
+ lt_prog_compiler_static_GCJ=
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-+
-+  if test "$GCC" = yes; then
-+    lt_prog_compiler_wl_GCJ='-Wl,'
-+    lt_prog_compiler_static_GCJ='-static'
-+
-+    case $host_os in
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static_GCJ='-Bstatic'
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+
-+    mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic_GCJ='-fno-common'
-+      ;;
-+
+ 
+   if test "$GCC" = yes; then
+     lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -18513,6 +19670,11 @@
+       lt_prog_compiler_pic_GCJ='-fno-common'
+       ;;
+ 
 +    interix3*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
 +
-+    msdosdjgpp*)
-+      # Just because we use GCC doesn't mean we suddenly get shared libraries
-+      # on systems that don't support them.
-+      lt_prog_compiler_can_build_shared_GCJ=no
-+      enable_shared=no
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	lt_prog_compiler_pic_GCJ=-Kconform_pic
-+      fi
-+      ;;
-+
-+    hpux*)
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -18529,7 +19691,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
 +      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	lt_prog_compiler_pic_GCJ='-fPIC'
-+	;;
-+      esac
-+      ;;
-+
-+    *)
-+      lt_prog_compiler_pic_GCJ='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
-+    aix*)
-+      lt_prog_compiler_wl_GCJ='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static_GCJ='-Bstatic'
-+      else
-+	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -18555,6 +19717,16 @@
+ 	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
 +      darwin*)
 +        # PIC is the default on this platform
 +        # Common symbols not allowed in MH_DYLIB files
@@ -35949,47 +22094,31 @@
 +         ;;
 +       esac
 +       ;;
-+
-+    mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      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.
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -18566,7 +19738,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.
+-      case "$host_cpu" in
 +      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	lt_prog_compiler_pic_GCJ='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      lt_prog_compiler_wl_GCJ='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      lt_prog_compiler_static_GCJ='-non_shared'
-+      ;;
-+
-+    newsos6)
-+      lt_prog_compiler_pic_GCJ='-KPIC'
-+      lt_prog_compiler_static_GCJ='-Bstatic'
-+      ;;
-+
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -18589,13 +19761,20 @@
+       lt_prog_compiler_static_GCJ='-Bstatic'
+       ;;
+ 
+-    linux*)
+-      case $CC in
 +    linux* | k*bsd*-gnu)
 +      case $cc_basename in
-+      icc* | ecc*)
-+	lt_prog_compiler_wl_GCJ='-Wl,'
-+	lt_prog_compiler_pic_GCJ='-KPIC'
-+	lt_prog_compiler_static_GCJ='-static'
-+        ;;
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_GCJ='-Wl,'
+ 	lt_prog_compiler_pic_GCJ='-KPIC'
+ 	lt_prog_compiler_static_GCJ='-static'
+         ;;
 +      pgcc* | pgf77* | pgf90* | pgf95*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
@@ -35997,50 +22126,44 @@
 +	lt_prog_compiler_pic_GCJ='-fpic'
 +	lt_prog_compiler_static_GCJ='-Bstatic'
 +        ;;
-+      ccc*)
-+        lt_prog_compiler_wl_GCJ='-Wl,'
-+        # All Alpha code is PIC.
-+        lt_prog_compiler_static_GCJ='-non_shared'
-+        ;;
-+      esac
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      lt_prog_compiler_wl_GCJ='-Wl,'
-+      # All OSF/1 code is PIC.
-+      lt_prog_compiler_static_GCJ='-non_shared'
-+      ;;
-+
-+    solaris*)
-+      lt_prog_compiler_pic_GCJ='-KPIC'
-+      lt_prog_compiler_static_GCJ='-Bstatic'
+       ccc*)
+         lt_prog_compiler_wl_GCJ='-Wl,'
+         # All Alpha code is PIC.
+@@ -18610,15 +19789,15 @@
+       lt_prog_compiler_static_GCJ='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      lt_prog_compiler_pic_GCJ='-Kpic'
+-      lt_prog_compiler_static_GCJ='-dn'
+-      ;;
+-
+     solaris*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+       lt_prog_compiler_pic_GCJ='-KPIC'
+       lt_prog_compiler_static_GCJ='-Bstatic'
 +      case $cc_basename in
 +      f77* | f90* | f95*)
 +	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
 +      *)
 +	lt_prog_compiler_wl_GCJ='-Wl,';;
 +      esac
-+      ;;
-+
-+    sunos4*)
-+      lt_prog_compiler_wl_GCJ='-Qoption ld '
-+      lt_prog_compiler_pic_GCJ='-PIC'
-+      lt_prog_compiler_static_GCJ='-Bstatic'
-+      ;;
-+
+       ;;
+ 
+     sunos4*)
+@@ -18627,7 +19806,7 @@
+       lt_prog_compiler_static_GCJ='-Bstatic'
+       ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_pic_GCJ='-KPIC'
-+      lt_prog_compiler_static_GCJ='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_prog_compiler_pic_GCJ='-Kconform_pic'
-+	lt_prog_compiler_static_GCJ='-Bstatic'
-+      fi
-+      ;;
-+
+       lt_prog_compiler_wl_GCJ='-Wl,'
+       lt_prog_compiler_pic_GCJ='-KPIC'
+       lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -18640,6 +19819,17 @@
+       fi
+       ;;
+ 
 +    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +      lt_prog_compiler_wl_GCJ='-Wl,'
 +      lt_prog_compiler_pic_GCJ='-KPIC'
@@ -36052,84 +22175,81 @@
 +      lt_prog_compiler_can_build_shared_GCJ=no
 +      ;;
 +
-+    uts4*)
-+      lt_prog_compiler_pic_GCJ='-pic'
-+      lt_prog_compiler_static_GCJ='-Bstatic'
-+      ;;
-+
-+    *)
-+      lt_prog_compiler_can_build_shared_GCJ=no
-+      ;;
-+    esac
-+  fi
-+
+     uts4*)
+       lt_prog_compiler_pic_GCJ='-pic'
+       lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -18651,16 +19841,16 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic_GCJ"; then
-+
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_GCJ"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-+if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_prog_compiler_pic_works_GCJ=no
-+  ac_outfile=conftest.$ac_objext
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # 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 \
+ if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18674,26 +19864,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 \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18680: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:19870: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18684: \$? = $ac_status" >&5
 +   echo "$as_me:19874: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
+    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
+-     if test ! -s conftest.err; then
 +     # So say no if there are warnings other than the usual output.
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
 +     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_prog_compiler_pic_works_GCJ=yes
-+     fi
-+   fi
-+   $rm conftest*
-+
-+fi
+        lt_prog_compiler_pic_works_GCJ=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
-+
-+if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-+    case $lt_prog_compiler_pic_GCJ in
-+     "" | " "*) ;;
-+     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-+     esac
-+else
-+    lt_prog_compiler_pic_GCJ=
-+     lt_prog_compiler_can_build_shared_GCJ=no
-+fi
-+
-+fi
+ 
+ if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+     case $lt_prog_compiler_pic_GCJ in
+@@ -18706,7 +19898,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
 +case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic_GCJ=
-+    ;;
-+  *)
-+    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
-+    ;;
-+esac
-+
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic_GCJ=
+@@ -18716,8 +19908,50 @@
+     ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -36174,116 +22294,103 @@
 +
 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_prog_compiler_c_o_GCJ=no
-+   $rm -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
+ if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18728,60 +19962,58 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18747: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:19974: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18751: \$? = $ac_status" >&5
 +   echo "$as_me:19978: \$? = $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
-+     # So say no if there are warnings
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
 +     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
 +     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o_GCJ=yes
-+     fi
-+   fi
+        lt_cv_prog_compiler_c_o_GCJ=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
 +   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
 +   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
 +   $rm out/* && rmdir out
-+   cd ..
-+   rmdir conftest
-+   $rm conftest*
-+
-+fi
+    cd ..
+    rmdir conftest
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-+
-+
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
+ 
+ 
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
 +  { echo "$as_me:$LINENO: result: $hard_links" >&5
 +echo "${ECHO_T}$hard_links" >&6; }
-+  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;}
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
+   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;}
+@@ -18791,8 +20023,8 @@
+   need_locks=no
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-+
-+  runpath_var=
-+  allow_undefined_flag_GCJ=
-+  enable_shared_with_static_runtimes_GCJ=no
-+  archive_cmds_GCJ=
-+  archive_expsym_cmds_GCJ=
-+  old_archive_From_new_cmds_GCJ=
-+  old_archive_from_expsyms_cmds_GCJ=
-+  export_dynamic_flag_spec_GCJ=
-+  whole_archive_flag_spec_GCJ=
-+  thread_safe_flag_spec_GCJ=
-+  hardcode_libdir_flag_spec_GCJ=
-+  hardcode_libdir_flag_spec_ld_GCJ=
-+  hardcode_libdir_separator_GCJ=
-+  hardcode_direct_GCJ=no
-+  hardcode_minus_L_GCJ=no
-+  hardcode_shlibpath_var_GCJ=unsupported
-+  link_all_deplibs_GCJ=unknown
-+  hardcode_automatic_GCJ=no
-+  module_cmds_GCJ=
-+  module_expsym_cmds_GCJ=
-+  always_export_symbols_GCJ=no
-+  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  include_expsyms_GCJ=
-+  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
-+  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
-+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+  # platforms (ab)use it in PIC code, but their linkers get confused if
-+  # the symbol is explicitly referenced.  Since portable code cannot
-+  # rely on this symbol name, it's probably fine to never include it in
-+  # preloaded symbol tables.
-+  extract_expsyms_cmds=
+ 
+   runpath_var=
+   allow_undefined_flag_GCJ=
+@@ -18830,6 +20062,16 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
 +  # Just being paranoid about ensuring that cc_basename is set.
 +  for cc_temp in $compiler""; do
 +  case $cc_temp in
@@ -36294,30 +22401,24 @@
 +  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+@@ -18840,6 +20082,10 @@
+       with_gnu_ld=no
+     fi
+     ;;
 +  interix*)
 +    # we just hope/assume this is gcc and not c89 (= MSVC++)
 +    with_gnu_ld=yes
 +    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+  esac
-+
-+  ld_shlibs_GCJ=yes
-+  if test "$with_gnu_ld" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
-+
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+@@ -18850,6 +20096,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
@@ -36339,70 +22440,43 @@
 +      *) supports_anon_versioning=yes ;;
 +    esac
 +
-+    # See if GNU ld supports shared libraries.
-+    case $host_os in
-+    aix3* | aix4* | aix5*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+	ld_shlibs_GCJ=no
-+	cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+      hardcode_minus_L_GCJ=yes
-+
-+      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
-+      # that the semantics of dynamic libraries on AmigaOS, at least up
-+      # to version 4, is to share data among multiple programs linked
-+      # with the same dynamic library.  Since this doesn't match the
-+      # behavior of shared libraries on other platforms, we can't use
-+      # them.
-+      ld_shlibs_GCJ=no
-+      ;;
-+
-+    beos*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	allow_undefined_flag_GCJ=unsupported
-+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -18887,7 +20154,7 @@
+ 	allow_undefined_flag_GCJ=unsupported
+ 	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds_GCJ='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
 +	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	ld_shlibs_GCJ=no
-+      fi
-+      ;;
-+
-+    cygwin* | mingw* | pw32*)
-+      # _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'
+       else
+ 	ld_shlibs_GCJ=no
+       fi
+@@ -18897,13 +20164,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'
+-      allow_undefined_flag_GCJ=no
 +      allow_undefined_flag_GCJ=unsupported
-+      always_export_symbols_GCJ=no
-+      enable_shared_with_static_runtimes_GCJ=yes
+       always_export_symbols_GCJ=no
+       enable_shared_with_static_runtimes_GCJ=yes
+-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 +      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+
-+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 +        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# 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
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
+ 	# 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
+@@ -18912,23 +20179,70 @@
+ 	  echo EXPORTS > $output_objdir/$soname.def;
+ 	  cat $export_symbols >> $output_objdir/$soname.def;
+ 	fi~
+-	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      else
+       else
+-	ld_shlibs=no
 +	ld_shlibs_GCJ=no
 +      fi
 +      ;;
@@ -36451,40 +22525,40 @@
 +	link_all_deplibs_GCJ=no
 +      else
 +	ld_shlibs_GCJ=no
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    solaris* | sysv5*)
 +    solaris*)
-+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+	ld_shlibs_GCJ=no
-+	cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs_GCJ=no
+ 	cat <<EOF 1>&2
+@@ -18942,13 +20256,40 @@
+ 
+ EOF
+       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs_GCJ=no
-+      fi
-+      ;;
-+
+       else
+ 	ld_shlibs_GCJ=no
+       fi
+       ;;
+ 
 +    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 +      case `$LD -v 2>&1` in
 +        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
@@ -36512,62 +22586,55 @@
 +      esac
 +      ;;
 +
-+    sunos4*)
-+      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      hardcode_direct_GCJ=yes
-+      hardcode_shlibpath_var_GCJ=no
-+      ;;
-+
-+    *)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+     sunos4*)
+       archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+@@ -18958,24 +20299,19 @@
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs_GCJ=no
-+      fi
-+      ;;
-+    esac
-+
+       else
+ 	ld_shlibs_GCJ=no
+       fi
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs_GCJ" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec_GCJ=
+-      fi
 +    if test "$ld_shlibs_GCJ" = no; then
 +      runpath_var=
 +      hardcode_libdir_flag_spec_GCJ=
 +      export_dynamic_flag_spec_GCJ=
 +      whole_archive_flag_spec_GCJ=
-+    fi
-+  else
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      allow_undefined_flag_GCJ=unsupported
-+      always_export_symbols_GCJ=yes
-+      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      hardcode_minus_L_GCJ=yes
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -18987,7 +20323,7 @@
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       hardcode_minus_L_GCJ=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
 +      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	hardcode_direct_GCJ=unsupported
-+      fi
-+      ;;
-+
-+    aix4* | aix5*)
-+      if test "$host_cpu" = ia64; then
-+	# On IA64, the linker does run time linking by default, so we don't
-+	# have to do anything special.
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	hardcode_direct_GCJ=unsupported
+@@ -19009,9 +20345,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
 +	aix_use_runtimelinking=no
-+	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
-+      else
-+	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+	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
-+	aix_use_runtimelinking=no
 +
 +	# Test if we are trying to use run time linking or normal
 +	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -36581,87 +22648,71 @@
 +	  done
 +	  ;;
 +	esac
-+
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
-+
-+      # When large executables or shared objects are built, AIX ld can
-+      # have problems creating the table of contents.  If linking a library
-+      # or program results in "error TOC overflow" add -mminimal-toc to
-+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+      archive_cmds_GCJ=''
-+      hardcode_direct_GCJ=yes
-+      hardcode_libdir_separator_GCJ=':'
-+      link_all_deplibs_GCJ=yes
-+
-+      if test "$GCC" = yes; then
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+@@ -19028,7 +20376,7 @@
+       link_all_deplibs_GCJ=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.012|aix4.012.*)
 +	case $host_os in aix4.[012]|aix4.[012].*)
-+	# 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`
-+	  if test -f "$collect2name" && \
-+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	  then
-+  	  # We have reworked collect2
-+  	  hardcode_direct_GCJ=yes
-+	  else
-+  	  # We have old collect2
-+  	  hardcode_direct_GCJ=unsupported
-+  	  # It fails to find uninstalled libraries when the uninstalled
-+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+  	  # to unsupported forces relinking
-+  	  hardcode_minus_L_GCJ=yes
-+  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+  	  hardcode_libdir_separator_GCJ=
-+	  fi
+ 	# 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`
+@@ -19047,8 +20395,12 @@
+   	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+   	  hardcode_libdir_separator_GCJ=
+ 	  fi
 +	  ;;
-+	esac
-+	shared_flag='-shared'
+ 	esac
+ 	shared_flag='-shared'
 +	if test "$aix_use_runtimelinking" = yes; then
 +	  shared_flag="$shared_flag "'${wl}-G'
 +	fi
-+      else
-+	# not using gcc
-+	if test "$host_cpu" = ia64; then
-+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+  	# chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+	else
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -19056,22 +20408,23 @@
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
 +	  if test "$aix_use_runtimelinking" = yes; then
 +	    shared_flag='${wl}-G'
-+	  else
+ 	  else
+-	    shared_flag='-qmkshrobj'
+-  	fi
 +	    shared_flag='${wl}-bM:SRE'
 +	  fi
-+	fi
-+      fi
-+
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      always_export_symbols_GCJ=no
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      always_export_symbols_GCJ=yes
-+      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.
-+	allow_undefined_flag_GCJ='-berok'
-+       # Determine the default libpath from the value encoded in an empty executable.
+       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.
+ 	allow_undefined_flag_GCJ='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
 +       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 conftest$ac_exeext
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -19087,27 +20440,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -36669,58 +22720,65 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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; }
+ }'`
+@@ -19118,19 +20467,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
 +	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+       else
-+	if test "$host_cpu" = ia64; then
-+	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-+	  allow_undefined_flag_GCJ="-z nodefs"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
+ 	  allow_undefined_flag_GCJ="-z nodefs"
+-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
 +	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+	else
-+	 # Determine the default libpath from the value encoded in an empty executable.
-+	 cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 cat >conftest.$ac_ext <<_ACEOF
+@@ -19149,27 +20499,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -36728,81 +22786,115 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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; }
+ }'`
+@@ -19180,8 +20526,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	  # Warning - without using the other run time loading flags,
-+	  # -berok will link without error, but may produce a broken library.
-+	  no_undefined_flag_GCJ=' ${wl}-bernotok'
-+	  allow_undefined_flag_GCJ=' ${wl}-berok'
-+	  # Exported symbols can be pulled into shared objects from archives
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -19190,13 +20538,11 @@
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  no_undefined_flag_GCJ=' ${wl}-bernotok'
+ 	  allow_undefined_flag_GCJ=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  always_export_symbols_GCJ=yes
+ 	  # Exported symbols can be pulled into shared objects from archives
+-	  whole_archive_flag_spec_GCJ=' '
 +	  whole_archive_flag_spec_GCJ='$convenience'
-+	  archive_cmds_need_lc_GCJ=yes
+ 	  archive_cmds_need_lc_GCJ=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	fi
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+      hardcode_minus_L_GCJ=yes
-+      # see comment about different semantics on the GNU ld section
-+      ld_shlibs_GCJ=no
-+      ;;
-+
+ 	fi
+       fi
+       ;;
+@@ -19209,7 +20555,7 @@
+       ld_shlibs_GCJ=no
+       ;;
+ 
+-    bsdi4*)
 +    bsdi[45]*)
-+      export_dynamic_flag_spec_GCJ=-rdynamic
-+      ;;
-+
-+    cygwin* | mingw* | pw32*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      hardcode_libdir_flag_spec_GCJ=' '
+       export_dynamic_flag_spec_GCJ=-rdynamic
+       ;;
+ 
+@@ -19219,68 +20565,68 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       hardcode_libdir_flag_spec_GCJ=' '
+-      allow_undefined_flag_GCJ=no
 +      allow_undefined_flag_GCJ=unsupported
-+      # Tell ltmain to make .lib files, not .a files.
-+      libext=lib
-+      # Tell ltmain to make .dll files, not .so files.
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
 +      shrext_cmds=".dll"
-+      # FIXME: Setting linknames here is a bad hack.
+       # FIXME: Setting linknames here is a bad hack.
+-      archive_cmds_GCJ='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
 +      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      old_archive_From_new_cmds_GCJ='true'
-+      # FIXME: Should let the user specify the lib program.
-+      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+       # The linker will automatically build a .lib file if we build a DLL.
+       old_archive_From_new_cmds_GCJ='true'
+       # FIXME: Should let the user specify the lib program.
+       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
 +      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-+      enable_shared_with_static_runtimes_GCJ=yes
-+      ;;
-+
-+    darwin* | rhapsody*)
+       enable_shared_with_static_runtimes_GCJ=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc_GCJ=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
+-	allow_undefined_flag_GCJ='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.012)
+-	      allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
 +      case $host_os in
 +        rhapsody* | darwin1.[012])
 +         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
@@ -36821,13 +22913,32 @@
 +           esac
 +         fi
 +         ;;
-+      esac
+       esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-      fi
+-      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +      archive_cmds_need_lc_GCJ=no
-+      hardcode_direct_GCJ=no
-+      hardcode_automatic_GCJ=yes
-+      hardcode_shlibpath_var_GCJ=unsupported
+       hardcode_direct_GCJ=no
+       hardcode_automatic_GCJ=yes
+       hardcode_shlibpath_var_GCJ=unsupported
+-      whole_archive_flag_spec_GCJ='-all_load $convenience'
 +      whole_archive_flag_spec_GCJ=''
-+      link_all_deplibs_GCJ=yes
+       link_all_deplibs_GCJ=yes
 +    if test "$GCC" = yes ; then
 +    	output_verbose_link_cmd='echo'
 +        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
@@ -36835,7 +22946,8 @@
 +      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 +      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    else
+     else
+-      ld_shlibs_GCJ=no
 +      case $cc_basename in
 +        xlc*)
 +         output_verbose_link_cmd='echo'
@@ -36849,64 +22961,39 @@
 +         ld_shlibs_GCJ=no
 +          ;;
 +      esac
-+    fi
-+      ;;
-+
-+    dgux*)
-+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+      hardcode_shlibpath_var_GCJ=no
-+      ;;
-+
-+    freebsd1*)
-+      ld_shlibs_GCJ=no
-+      ;;
-+
-+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+    # support.  Future versions do this automatically, but an explicit c++rt0.o
-+    # does not break anything, and helps significantly (at the cost of a little
-+    # extra space).
-+    freebsd2.2*)
-+      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+      hardcode_direct_GCJ=yes
-+      hardcode_shlibpath_var_GCJ=no
-+      ;;
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct_GCJ=yes
-+      hardcode_minus_L_GCJ=yes
-+      hardcode_shlibpath_var_GCJ=no
-+      ;;
-+
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+     fi
+       ;;
+ 
+@@ -19314,8 +20660,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
 +    freebsd* | dragonfly*)
 +      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+      hardcode_direct_GCJ=yes
-+      hardcode_shlibpath_var_GCJ=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
+       hardcode_libdir_flag_spec_GCJ='-R$libdir'
+       hardcode_direct_GCJ=yes
+       hardcode_shlibpath_var_GCJ=no
+@@ -19323,7 +20669,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 +	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      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
-+      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_separator_GCJ=:
-+      hardcode_direct_GCJ=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      hardcode_minus_L_GCJ=yes
-+      export_dynamic_flag_spec_GCJ='${wl}-E'
-+      ;;
-+
+       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
+@@ -19337,47 +20683,62 @@
+       export_dynamic_flag_spec_GCJ='${wl}-E'
+       ;;
+ 
+-    hpux10* | hpux11*)
 +    hpux10*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -36932,153 +23019,160 @@
 +	  ;;
 +	ia64*)
 +	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
+ 	  ;;
+ 	*)
+-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
 +	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      else
+ 	  ;;
+ 	esac
+       else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	case $host_cpu in
 +	hppa*64*)
 +	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
 +	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
+ 	  ;;
+ 	*)
+-	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 +	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      fi
-+      if test "$with_gnu_ld" = no; then
+ 	  ;;
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_separator_GCJ=:
 +
 +	case $host_cpu in
 +	hppa*64*|ia64*)
-+	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-+	  hardcode_direct_GCJ=no
-+	  hardcode_shlibpath_var_GCJ=no
-+	  ;;
-+	*)
-+	  hardcode_direct_GCJ=yes
-+	  export_dynamic_flag_spec_GCJ='${wl}-E'
-+
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  hardcode_minus_L_GCJ=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
+ 	  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
+-
+-	  # 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'
+ 
+@@ -19391,7 +20752,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      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'
-+      fi
-+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator_GCJ=:
-+      link_all_deplibs_GCJ=yes
-+      ;;
-+
+       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'
+@@ -19401,7 +20762,7 @@
+       link_all_deplibs_GCJ=yes
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+      hardcode_direct_GCJ=yes
-+      hardcode_shlibpath_var_GCJ=no
-+      ;;
-+
-+    newsos6)
-+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct_GCJ=yes
-+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator_GCJ=:
-+      hardcode_shlibpath_var_GCJ=no
-+      ;;
-+
-+    openbsd*)
-+      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
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -19424,7 +20785,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
+-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+	export_dynamic_flag_spec_GCJ='${wl}-E'
-+      else
-+       case $host_os in
-+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+	   ;;
-+	 *)
+ 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+ 	export_dynamic_flag_spec_GCJ='${wl}-E'
+       else
+@@ -19434,7 +20796,7 @@
+ 	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+	   ;;
-+       esac
-+      fi
-+      ;;
-+
-+    os2*)
-+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+      hardcode_minus_L_GCJ=yes
-+      allow_undefined_flag_GCJ=unsupported
+ 	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -19445,14 +20807,14 @@
+       hardcode_libdir_flag_spec_GCJ='-L$libdir'
+       hardcode_minus_L_GCJ=yes
+       allow_undefined_flag_GCJ=unsupported
+-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
 +      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
-+
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+       old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      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'
-+      fi
-+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator_GCJ=:
-+      ;;
-+
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+       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'
+@@ -19464,13 +20826,13 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-+      else
-+	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-+	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+ 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+       else
+ 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+ 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
 +	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+	# Both c and cxx compiler support -rpath directly
-+	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-+      fi
-+      hardcode_libdir_separator_GCJ=:
-+      ;;
-+
-+    solaris*)
-+      no_undefined_flag_GCJ=' -z text'
-+      if test "$GCC" = yes; then
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+@@ -19478,21 +20840,15 @@
+       hardcode_libdir_separator_GCJ=:
+       ;;
+ 
+-    sco3.2v5*)
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_GCJ=no
+-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+-
+     solaris*)
+       no_undefined_flag_GCJ=' -z text'
+       if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	wlarc='${wl}'
 +	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-+      else
+       else
 +	wlarc=''
-+	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'
-+      fi
-+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+      hardcode_shlibpath_var_GCJ=no
-+      case $host_os in
-+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+ 	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'
+@@ -19501,8 +20857,18 @@
+       hardcode_shlibpath_var_GCJ=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
 +      *)
 + 	# The compiler driver will combine linker options so we
 + 	# cannot just pass the convience library names through
@@ -37091,77 +23185,58 @@
 + 	*)
 + 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
 + 	esac ;;
-+      esac
-+      link_all_deplibs_GCJ=yes
-+      ;;
-+
-+    sunos4*)
-+      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.
+       esac
+       link_all_deplibs_GCJ=yes
+       ;;
+@@ -19511,7 +20877,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.
+-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+      hardcode_direct_GCJ=yes
-+      hardcode_minus_L_GCJ=yes
-+      hardcode_shlibpath_var_GCJ=no
-+      ;;
-+
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct_GCJ=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-+	  hardcode_direct_GCJ=no
-+        ;;
-+	motorola)
-+	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      hardcode_shlibpath_var_GCJ=no
-+      ;;
-+
-+    sysv4.3*)
-+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var_GCJ=no
-+      export_dynamic_flag_spec_GCJ='-Bexport'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_shlibpath_var_GCJ=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	ld_shlibs_GCJ=yes
-+      fi
-+      ;;
-+
+       else
+ 	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -19559,36 +20925,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_GCJ=yes
+-      hardcode_minus_L_GCJ=no
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
 +      no_undefined_flag_GCJ='${wl}-z,text'
 +      archive_cmds_need_lc_GCJ=no
-+      hardcode_shlibpath_var_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
 +      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag_GCJ='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
+       else
+-	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
+       fi
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var_GCJ=no
+       ;;
+ 
+-    sysv5*)
+-      no_undefined_flag_GCJ=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      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'
+-      hardcode_libdir_flag_spec_GCJ=
 +    sysv5* | sco3.2v5* | sco5v6*)
 +      # Note: We can NOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
@@ -37172,12 +23247,12 @@
 +      no_undefined_flag_GCJ='${wl}-z,text'
 +      allow_undefined_flag_GCJ='${wl}-z,nodefs'
 +      archive_cmds_need_lc_GCJ=no
-+      hardcode_shlibpath_var_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
 +      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
 +      hardcode_libdir_separator_GCJ=':'
 +      link_all_deplibs_GCJ=yes
 +      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
+       runpath_var='LD_RUN_PATH'
 +
 +      if test "$GCC" = yes; then
 +	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -37186,102 +23261,77 @@
 +	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
-+      ;;
-+
-+    uts4*)
-+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+      hardcode_shlibpath_var_GCJ=no
-+      ;;
-+
-+    *)
-+      ld_shlibs_GCJ=no
-+      ;;
-+    esac
-+  fi
-+
+       ;;
+ 
+     uts4*)
+@@ -19603,15 +20978,10 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
 +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
-+test "$ld_shlibs_GCJ" = no && can_build_shared=no
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc_GCJ" in
-+x|xyes)
-+  # Assume -lc should be added
-+  archive_cmds_need_lc_GCJ=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $archive_cmds_GCJ in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-+      ;;
-+    '$CC '*)
-+      # 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.
+ test "$ld_shlibs_GCJ" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -19629,8 +20999,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.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
 +      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-+      $rm conftest*
-+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl_GCJ
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+@@ -19644,6 +21014,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl_GCJ
 +	pic_flag=$lt_prog_compiler_pic_GCJ
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-+        allow_undefined_flag_GCJ=
-+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+        then
-+	  archive_cmds_need_lc_GCJ=no
-+        else
-+	  archive_cmds_need_lc_GCJ=yes
-+        fi
-+        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $rm conftest*
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -19666,20 +21037,20 @@
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
 +      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
 +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
-+
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
 +shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -19689,7 +21060,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +if test "$GCC" = yes; then
 +  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 +  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
@@ -37296,184 +23346,82 @@
 +else
 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[01] | aix4.[01].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-+      ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -19754,7 +21138,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
 +  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
+   ;;
+ 
+ beos*)
+@@ -19763,7 +21147,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
 +bsdi[45]*)
-+  version_type=linux
-+  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 $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -19779,7 +21163,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
 +  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
-+
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -19791,7 +21175,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
 +      $install_prog $dir/$dlname \$dldir/$dlname~
 +      chmod a+x \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-+    mingw*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -19821,7 +21206,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
 +      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    esac
-+    ;;
-+
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
+       ;;
+     esac
+     ;;
+@@ -19844,7 +21229,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+  if test "$GCC" = yes; then
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+  else
-+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
-+
-+dgux*)
-+  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
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
+   # 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"`
+@@ -19867,20 +21252,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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='GNU ld.so'
+-  ;;
+-
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
@@ -37485,95 +23433,65 @@
 +    *) objformat=elf ;;
 +    esac
 +  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -19898,14 +21280,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
 +  freebsd3.[01]* | freebsdelf3.[01]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
 +  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
 +  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
 +  freebsd*) # from 4.6 on
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
-+  esac
-+  ;;
-+
-+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
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
+   esac
+   ;;
+ 
+@@ -19925,9 +21312,9 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  case "$host_cpu" in
 +  case $host_cpu in
-+  ia64*)
+   ia64*)
+-    shrext='.so'
 +    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+   hppa*64*)
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -19942,7 +21329,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
 +     shrext_cmds='.sl'
-+     hardcode_into_libs=yes
-+     dynamic_linker="$host_os dld.sl"
-+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+     soname_spec='${libname}${release}${shared_ext}$major'
-+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+     ;;
-+   *)
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -19953,7 +21340,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
 +    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    ;;
-+  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -19965,6 +21352,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
 +interix3*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -37586,78 +23504,50 @@
 +  hardcode_into_libs=yes
 +  ;;
 +
-+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.
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -20008,29 +21407,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'
-+  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
-+
+   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'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+   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
+ 
 +  # 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,
-+  # 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'
-+  ;;
-+
+   # 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,
+@@ -20040,6 +21436,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -37670,145 +23560,69 @@
 +  dynamic_linker='NetBSD ld.elf_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
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -20049,7 +21457,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}'
 +    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
-+  ;;
-+
-+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
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -20077,8 +21485,13 @@
+ 
+ openbsd*)
+   version_type=sunos
 +  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
+   need_lib_prefix=no
+-  need_version=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
-+  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'
+   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
+@@ -20098,7 +21511,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
 +  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*)
-+  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"
-+  ;;
-+
-+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'
-+  ;;
-+
-+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
-+  ;;
-+
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -20116,13 +21529,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  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
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -20148,7 +21554,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +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
-+  ;;
-+
-+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
-+  ;;
-+
+   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'
+@@ -20181,6 +21587,29 @@
+   fi
+   ;;
+ 
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -37832,21 +23646,21 @@
 +  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
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -20192,16 +21621,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 +echo "${ECHO_T}$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
-+
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
+-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
 +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"
@@ -37854,32 +23668,866 @@
 +
 +{ 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=
-+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+ hardcode_action_GCJ=
+ if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+-   test -n "$runpath_var GCJ" || \
+-   test "X$hardcode_automatic_GCJ"="Xyes" ; then
 +   test -n "$runpath_var_GCJ" || \
 +   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct_GCJ" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-+     test "$hardcode_minus_L_GCJ" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action_GCJ=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action_GCJ=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action_GCJ=unsupported
-+fi
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct_GCJ" != no &&
+@@ -20221,851 +21655,16 @@
+   # directories.
+   hardcode_action_GCJ=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+-echo "${ECHO_T}$hardcode_action_GCJ" >&6
+-
+-if test "$hardcode_action_GCJ" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
+-fi
+-
+-striplib=
+-old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-       else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-       ;;
+-   *)
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-    ;;
+-  esac
+-fi
+-
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
+-else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
+-
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ;;
+-
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
+-   ;;
+-
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
+-
+-  darwin*)
+-  # if libdl is installed we need to link against it
+-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any 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 dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  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_lib_dl_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-
+-fi
+-
+-   ;;
+-
+-  *)
+-    echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+-if test "${ac_cv_func_shl_load+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define shl_load innocuous_shl_load
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shl_load
+-
+-/* Override any 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 shl_load ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
+-choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != shl_load;
+-  ;
+-  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_func_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_shl_load=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+-if test $ac_cv_func_shl_load = yes; then
+-  lt_cv_dlopen="shl_load"
+-else
+-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* 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 shl_load ();
+-int
+-main ()
+-{
+-shl_load ();
+-  ;
+-  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_lib_dld_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_dld_shl_load=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+-if test $ac_cv_lib_dld_shl_load = yes; then
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+-else
+-  echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+-if test "${ac_cv_func_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define dlopen innocuous_dlopen
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef dlopen
+-
+-/* Override any 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 dlopen ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
+-choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != dlopen;
+-  ;
+-  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_func_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+-if test $ac_cv_func_dlopen = yes; then
+-  lt_cv_dlopen="dlopen"
+-else
+-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any 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 dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  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_lib_dl_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* 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 dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  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_lib_svld_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_svld_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+-if test $ac_cv_lib_svld_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+-else
+-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* 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 dld_link ();
+-int
+-main ()
+-{
+-dld_link ();
+-  ;
+-  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_lib_dld_dld_link=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_dld_dld_link=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+-if test $ac_cv_lib_dld_dld_link = yes; then
+-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-    ;;
+-  esac
+-
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
+-
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
+-
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 20870 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    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
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
+-
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
+-
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
+-  fi
+-fi
+-rm -fr conftest*
+-
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+-
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 20968 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    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
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
+-
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
+-
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self_static=no
+-  fi
+-fi
+-rm -fr conftest*
+-
+-
+-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
 +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
 +echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-+
+ 
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
 +if test "$hardcode_action_GCJ" = relink; then
 +  # Fast installation is not supported
 +  enable_fast_install=no
@@ -37887,458 +24535,100 @@
 +     test "$enable_shared" = no; then
 +  # Fast installation is not necessary
 +  enable_fast_install=needless
-+fi
-+
-+
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  # See if we are running on zsh, and set the options which allow our commands through
-+  # without removal of \ escapes.
-+  if test -n "${ZSH_VERSION+set}" ; then
-+    setopt NO_GLOB_SUBST
-+  fi
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
+ fi
+ 
+ 
+@@ -21082,7 +21681,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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
 +  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
 +    SED SHELL STRIP \
-+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+    deplibs_check_method reload_flag reload_cmds need_locks \
-+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+    lt_cv_sys_global_symbol_to_c_name_address \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    old_postinstall_cmds old_postuninstall_cmds \
-+    compiler_GCJ \
-+    CC_GCJ \
-+    LD_GCJ \
-+    lt_prog_compiler_wl_GCJ \
-+    lt_prog_compiler_pic_GCJ \
-+    lt_prog_compiler_static_GCJ \
-+    lt_prog_compiler_no_builtin_flag_GCJ \
-+    export_dynamic_flag_spec_GCJ \
-+    thread_safe_flag_spec_GCJ \
-+    whole_archive_flag_spec_GCJ \
-+    enable_shared_with_static_runtimes_GCJ \
-+    old_archive_cmds_GCJ \
-+    old_archive_from_new_cmds_GCJ \
-+    predep_objects_GCJ \
-+    postdep_objects_GCJ \
-+    predeps_GCJ \
-+    postdeps_GCJ \
-+    compiler_lib_search_path_GCJ \
-+    archive_cmds_GCJ \
-+    archive_expsym_cmds_GCJ \
-+    postinstall_cmds_GCJ \
-+    postuninstall_cmds_GCJ \
-+    old_archive_from_expsyms_cmds_GCJ \
-+    allow_undefined_flag_GCJ \
-+    no_undefined_flag_GCJ \
-+    export_symbols_cmds_GCJ \
-+    hardcode_libdir_flag_spec_GCJ \
-+    hardcode_libdir_flag_spec_ld_GCJ \
-+    hardcode_libdir_separator_GCJ \
-+    hardcode_automatic_GCJ \
-+    module_cmds_GCJ \
-+    module_expsym_cmds_GCJ \
-+    lt_cv_prog_compiler_c_o_GCJ \
-+    exclude_expsyms_GCJ \
-+    include_expsyms_GCJ; do
-+
-+    case $var in
-+    old_archive_cmds_GCJ | \
-+    old_archive_from_new_cmds_GCJ | \
-+    archive_cmds_GCJ | \
-+    archive_expsym_cmds_GCJ | \
-+    module_cmds_GCJ | \
-+    module_expsym_cmds_GCJ | \
-+    old_archive_from_expsyms_cmds_GCJ | \
-+    export_symbols_cmds_GCJ | \
-+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  case $lt_echo in
-+  *'\$0 --fallback-echo"')
-+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+    ;;
-+  esac
-+
-+cfgfile="$ofile"
-+
-+  cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
+     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 \
+@@ -21182,6 +21782,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
 +host_os=$host_os
 +
 +# The build system.
 +build_alias=$build_alias
 +build=$build
 +build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -21193,6 +21799,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
 +# LTCC compiler flags.
 +LTCFLAGS=$lt_LTCFLAGS
 +
-+# A language-specific compiler.
-+CC=$lt_compiler_GCJ
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_GCJ
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_LD_GCJ
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
+ # A language-specific compiler.
+ CC=$lt_compiler_GCJ
+ 
+@@ -21212,7 +21821,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
 +STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_GCJ
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -21243,7 +21852,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
 +shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_GCJ
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-+
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -21258,7 +21867,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+ 
+-# Must we lock files when doing compilation ?
 +# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_GCJ
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_GCJ
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_GCJ
-+archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_GCJ
-+module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_GCJ
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_GCJ
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_GCJ
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_GCJ
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_GCJ
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_GCJ
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_GCJ
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_GCJ
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_GCJ
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_GCJ
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_GCJ"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_GCJ
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_GCJ
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_GCJ
-+
-+# ### END LIBTOOL TAG CONFIG: $tagname
-+
-+__EOF__
-+
-+
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -21460,7 +22069,10 @@
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+-  test -f Makefile && make "$ltmain"
 +  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
 +  if test -f "$ltmain_in"; then
 +    test -f Makefile && make "$ltmain"
 +  fi
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC="$lt_save_CC"
-+
-+	else
-+	  tagname=""
-+	fi
-+	;;
-+
-+      RC)
-+
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+objext_RC=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
+ fi
+ 
+ 
+@@ -21480,7 +22092,6 @@
+       RC)
+ 
+ 
+-
+ # Source file extension for RC test sources.
+ ac_ext=rc
+ 
+@@ -21499,15 +22110,42 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 +
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ 
+ 
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
@@ -38353,11 +24643,11 @@
 +$rm conftest*
 +
 +
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${RC-"windres"}
-+compiler=$CC
-+compiler_RC=$CC
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ compiler_RC=$CC
 +for cc_temp in $compiler""; do
 +  case $cc_temp in
 +    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
@@ -38368,692 +24658,232 @@
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +
-+lt_cv_prog_compiler_c_o_RC=yes
-+
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  # See if we are running on zsh, and set the options which allow our commands through
-+  # without removal of \ escapes.
-+  if test -n "${ZSH_VERSION+set}" ; then
-+    setopt NO_GLOB_SUBST
-+  fi
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
+ lt_cv_prog_compiler_c_o_RC=yes
+ 
+ # The else clause should only fire when bootstrapping the
+@@ -21523,7 +22161,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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
 +  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
 +    SED SHELL STRIP \
-+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+    deplibs_check_method reload_flag reload_cmds need_locks \
-+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+    lt_cv_sys_global_symbol_to_c_name_address \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    old_postinstall_cmds old_postuninstall_cmds \
-+    compiler_RC \
-+    CC_RC \
-+    LD_RC \
-+    lt_prog_compiler_wl_RC \
-+    lt_prog_compiler_pic_RC \
-+    lt_prog_compiler_static_RC \
-+    lt_prog_compiler_no_builtin_flag_RC \
-+    export_dynamic_flag_spec_RC \
-+    thread_safe_flag_spec_RC \
-+    whole_archive_flag_spec_RC \
-+    enable_shared_with_static_runtimes_RC \
-+    old_archive_cmds_RC \
-+    old_archive_from_new_cmds_RC \
-+    predep_objects_RC \
-+    postdep_objects_RC \
-+    predeps_RC \
-+    postdeps_RC \
-+    compiler_lib_search_path_RC \
-+    archive_cmds_RC \
-+    archive_expsym_cmds_RC \
-+    postinstall_cmds_RC \
-+    postuninstall_cmds_RC \
-+    old_archive_from_expsyms_cmds_RC \
-+    allow_undefined_flag_RC \
-+    no_undefined_flag_RC \
-+    export_symbols_cmds_RC \
-+    hardcode_libdir_flag_spec_RC \
-+    hardcode_libdir_flag_spec_ld_RC \
-+    hardcode_libdir_separator_RC \
-+    hardcode_automatic_RC \
-+    module_cmds_RC \
-+    module_expsym_cmds_RC \
-+    lt_cv_prog_compiler_c_o_RC \
-+    exclude_expsyms_RC \
-+    include_expsyms_RC; do
-+
-+    case $var in
-+    old_archive_cmds_RC | \
-+    old_archive_from_new_cmds_RC | \
-+    archive_cmds_RC | \
-+    archive_expsym_cmds_RC | \
-+    module_cmds_RC | \
-+    module_expsym_cmds_RC | \
-+    old_archive_from_expsyms_cmds_RC | \
-+    export_symbols_cmds_RC | \
-+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  case $lt_echo in
-+  *'\$0 --fallback-echo"')
-+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+    ;;
-+  esac
-+
-+cfgfile="$ofile"
-+
-+  cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_RC
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
+     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 \
+@@ -21623,6 +22262,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
 +host_os=$host_os
 +
 +# The build system.
 +build_alias=$build_alias
 +build=$build
 +build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -21634,6 +22279,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
 +# LTCC compiler flags.
 +LTCFLAGS=$lt_LTCFLAGS
 +
-+# A language-specific compiler.
-+CC=$lt_compiler_RC
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_RC
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_LD_RC
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
+ # A language-specific compiler.
+ CC=$lt_compiler_RC
+ 
+@@ -21653,7 +22301,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
 +STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_RC
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -21684,7 +22332,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
 +shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_RC
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-+
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -21699,7 +22347,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+ 
+-# Must we lock files when doing compilation ?
 +# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_RC
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_RC
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_RC
-+archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_RC
-+module_expsym_cmds=$lt_module_expsym_cmds_RC
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_RC
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_RC
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_RC
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_RC
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_RC
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_RC
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_RC
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_RC
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_RC
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_RC
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_RC
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_RC"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_RC
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_RC
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_RC
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_RC
-+
-+# ### END LIBTOOL TAG CONFIG: $tagname
-+
-+__EOF__
-+
-+
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -21901,7 +22549,10 @@
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+-  test -f Makefile && make "$ltmain"
 +  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
 +  if test -f "$ltmain_in"; then
 +    test -f Makefile && make "$ltmain"
 +  fi
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC="$lt_save_CC"
-+
-+	;;
-+
-+      *)
-+	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-+echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-+   { (exit 1); exit 1; }; }
-+	;;
-+      esac
-+
-+      # Append the new tag name to the list of available tags.
-+      if test -n "$tagname" ; then
-+      available_tags="$available_tags $tagname"
-+    fi
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+
-+  # Now substitute the updated list of available tags.
-+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-+    mv "${ofile}T" "$ofile"
-+    chmod +x "$ofile"
-+  else
-+    rm -f "${ofile}T"
-+    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-+echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+fi
-+
-+
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+
-+# Always use our own libtool.
+ fi
+ 
+ 
+@@ -21948,7 +22599,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
 +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+
-+# Prevent multiple expansion
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+LIBTOOL_SHELL="/bin/sh ./libtool"
-+#  LIBTOOL="$LIBTOOL --silent"
-+KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
-+
-+
-+# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
-+KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
-+
-+
-+# we patch configure quite some so we better keep that consistent for incremental runs
-+AUTOCONF='$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure'
-+
-+
-+
-+
-+
-+    # Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
+ 
+ # Prevent multiple expansion
+ 
+@@ -22003,8 +22654,8 @@
+ 
+     # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_MSGFMT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case "$MSGFMT" in
-+  /*)
-+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  for ac_dir in $PATH; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"; then
-+	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-+	break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
-+  ;;
-+esac
-+fi
-+MSGFMT="$ac_cv_path_MSGFMT"
-+if test -n "$MSGFMT"; then
+ if test "${ac_cv_path_MSGFMT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22030,17 +22681,17 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test -n "$MSGFMT"; then
+-  echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-echo "${ECHO_T}$MSGFMT" >&6
 +  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
 +echo "${ECHO_T}$MSGFMT" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
-+    # Extract the first word of "gmsgfmt", so it can be a program name with args.
-+set dummy gmsgfmt; ac_word=$2
+ fi
+ 
+     # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $GMSGFMT in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_path_GMSGFMT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22055,32 +22706,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_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
-+  fi
-+done
-+done
+     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
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-+  ;;
-+esac
-+fi
-+GMSGFMT=$ac_cv_path_GMSGFMT
-+if test -n "$GMSGFMT"; then
+ 
+   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+   ;;
+ esac
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+-
+ if test -n "$GMSGFMT"; then
+-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+-echo "${ECHO_T}$GMSGFMT" >&6
 +  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
 +echo "${ECHO_T}$GMSGFMT" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
+ 
 +
-+
-+
-+     if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
+      if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
+-        echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+-echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
 +        { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
 +echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; }
-+        GMSGFMT=":"
-+      fi
-+      MSGFMT=$GMSGFMT
-+
-+
-+
-+      # Extract the first word of "xgettext", so it can be a program name with args.
-+set dummy xgettext; ac_word=$2
+         GMSGFMT=":"
+       fi
+       MSGFMT=$GMSGFMT
+@@ -22089,8 +22741,8 @@
+ 
+       # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case "$XGETTEXT" in
-+  /*)
-+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  for ac_dir in $PATH; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-+	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-+	break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-+  ;;
-+esac
-+fi
-+XGETTEXT="$ac_cv_path_XGETTEXT"
-+if test -n "$XGETTEXT"; then
+ if test "${ac_cv_path_XGETTEXT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22116,11 +22768,11 @@
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test -n "$XGETTEXT"; then
+-  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-echo "${ECHO_T}$XGETTEXT" >&6
 +  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
 +echo "${ECHO_T}$XGETTEXT" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+            if test "$XGETTEXT" != ":"; then
-+			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+	  : ;
-+	else
+ fi
+ 
+ 
+@@ -22128,8 +22780,8 @@
+ 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ 	  : ;
+ 	else
+-	  echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
+-echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
 +	  { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
 +echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; }
-+	  XGETTEXT=":"
-+	fi
-+      fi
-+
-+
-+
-+
-+
-+
+ 	  XGETTEXT=":"
+ 	fi
+       fi
+@@ -22139,8 +22791,7 @@
+ 
+ 
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    ac_save_CXXFLAGS="$CXXFLAGS"
-+    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-+
+ 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'
+@@ -22152,8 +22803,8 @@
+     ac_save_CXXFLAGS="$CXXFLAGS"
+     CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
+ 
+-    echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
+-echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
 +echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; }
-+    if test "${kde_cv_stl_works+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <string>
-+using namespace std;
-+
-+int
-+main ()
-+{
-+
-+  string astring="Hallo Welt.";
-+  astring.erase(0, 6); // now astring is "Welt"
-+  return 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+     if test "${kde_cv_stl_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22181,41 +22832,37 @@
+ }
+ _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;;
@@ -39061,102 +24891,86 @@
 +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
+   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_cxx_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_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
-+
+   kde_cv_stl_works=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_stl_works=no
 +	kde_cv_stl_works=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: $kde_cv_stl_works" >&5
+-echo "${ECHO_T}$kde_cv_stl_works" >&6
 +   { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
 +echo "${ECHO_T}$kde_cv_stl_works" >&6; }
-+
-+   if test "$kde_cv_stl_works" = "yes"; then
-+     # back compatible
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SGI_STL 1
-+_ACEOF
-+
-+   else
-+	 { { echo "$as_me:$LINENO: error: Your Installation isn't able to compile simple C++ programs.
-+Check config.log for details - if you're using a Linux distribution you might miss
-+a package named similar to libstdc++-dev." >&5
-+echo "$as_me: error: Your Installation isn't able to compile simple C++ programs.
-+Check config.log for details - if you're using a Linux distribution you might miss
-+a package named similar to libstdc++-dev." >&2;}
-+   { (exit 1); exit 1; }; }
-+   fi
-+
-+   CXXFLAGS="$ac_save_CXXFLAGS"
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
+ 
+    if test "$kde_cv_stl_works" = "yes"; then
+      # back compatible
+@@ -22244,15 +22891,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for strlcat" >&5
+-echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for strlcat" >&5
 +echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; }
-+if test "${kde_cv_func_strlcat+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <string.h>
-+
-+
-+int
-+main ()
-+{
-+
-+ char buf[20];
-+  buf[0]='\0';
-+  strlcat(buf, "KDE function test", sizeof(buf));
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -22264,9 +22910,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22292,35 +22935,31 @@
+ }
+ _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;;
@@ -39164,99 +24978,75 @@
 +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
+   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_cxx_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_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
-+
+   kde_cv_func_strlcat=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_strlcat=no
 +	kde_cv_func_strlcat=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -22333,11 +22972,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
+-echo "${ECHO_T}$kde_cv_func_strlcat" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
 +echo "${ECHO_T}$kde_cv_func_strlcat" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
+-echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
 +echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; }
-+if test "${kde_cv_proto_strlcat+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_strlcat" = xyes; then
-+  kde_cv_proto_strlcat=no
-+else
-+  case "strlcat" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_strlcat="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_strlcat=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_strlcat" = xunknown; then
-+
-+
+ if test "${kde_cv_proto_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22358,8 +22997,7 @@
+ if test "x$kde_cv_proto_strlcat" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <string.h>
-+
-+
-+extern "C" unsigned long strlcat(char*, const char*, unsigned long);
-+
-+int
-+main ()
-+{
-+
-+ char buf[20];
-+  buf[0]='\0';
-+  strlcat(buf, "KDE function test", sizeof(buf));
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -22397,37 +23035,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39264,107 +25054,92 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
-+
+    kde_cv_func_strlcat=yes
+   kde_cv_proto_strlcat=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_strlcat="strlcat unavailable"
 +	kde_cv_proto_strlcat="strlcat unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -22440,8 +23075,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcat" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
 +echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; }
-+
-+if test "x$kde_cv_func_strlcat" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STRLCAT 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_strlcat" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STRLCAT_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
+ 
+ if test "x$kde_cv_func_strlcat" = xyes; then
+ 
+@@ -22465,15 +23100,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for strlcpy" >&5
+-echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for strlcpy" >&5
 +echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; }
-+if test "${kde_cv_func_strlcpy+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_strlcpy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <string.h>
-+
-+
-+int
-+main ()
-+{
-+
-+ char buf[20];
-+  strlcpy(buf, "KDE function test", sizeof(buf));
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -22485,9 +23119,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22512,35 +23143,31 @@
+ }
+ _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;;
@@ -39372,98 +25147,75 @@
 +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
+   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_cxx_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_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
-+
+   kde_cv_func_strlcpy=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_strlcpy=no
 +	kde_cv_func_strlcpy=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -22553,11 +23180,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_func_strlcpy" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
 +echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
+-echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
 +echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; }
-+if test "${kde_cv_proto_strlcpy+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_strlcpy" = xyes; then
-+  kde_cv_proto_strlcpy=no
-+else
-+  case "strlcpy" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_strlcpy="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_strlcpy=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_strlcpy" = xunknown; then
-+
-+
+ if test "${kde_cv_proto_strlcpy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22578,8 +23205,7 @@
+ if test "x$kde_cv_proto_strlcpy" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <string.h>
-+
-+
-+extern "C" unsigned long strlcpy(char*, const char*, unsigned long);
-+
-+int
-+main ()
-+{
-+
-+ char buf[20];
-+  strlcpy(buf, "KDE function test", sizeof(buf));
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -22616,37 +23242,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39471,87 +25223,81 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
-+
+    kde_cv_func_strlcpy=yes
+   kde_cv_proto_strlcpy=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_strlcpy="strlcpy unavailable"
 +	kde_cv_proto_strlcpy="strlcpy unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -22659,8 +23282,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
 +echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; }
-+
-+if test "x$kde_cv_func_strlcpy" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STRLCPY 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_strlcpy" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STRLCPY_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
+ 
+ if test "x$kde_cv_func_strlcpy" = xyes; then
+ 
+@@ -22683,8 +23306,8 @@
+ 
+ 
+ 
+-      echo "$as_me:$LINENO: checking for main in -lutil" >&5
+-echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6
 +      { echo "$as_me:$LINENO: checking for main in -lutil" >&5
 +echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_util_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
+ if test "${ac_cv_lib_util_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22701,52 +23324,49 @@
+ int
+ main ()
+ {
+-main ();
 +return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39559,58 +25305,72 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_util_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_util_main=no
 +	ac_cv_lib_util_main=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_util_main" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
 +echo "${ECHO_T}$ac_cv_lib_util_main" >&6; }
-+if test $ac_cv_lib_util_main = yes; then
-+  LIBUTIL="-lutil"
-+fi
-+
+ if test $ac_cv_lib_util_main = yes; then
+   LIBUTIL="-lutil"
+ fi
+ 
+-   echo "$as_me:$LINENO: checking for main in -lcompat" >&5
+-echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for main in -lcompat" >&5
 +echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_compat_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcompat  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
+ if test "${ac_cv_lib_compat_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22763,53 +23383,50 @@
+ int
+ main ()
+ {
+-main ();
 +return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39618,65 +25378,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_compat_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_compat_main=no
 +	ac_cv_lib_compat_main=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
 +echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; }
-+if test $ac_cv_lib_compat_main = yes; then
-+  LIBCOMPAT="-lcompat"
-+fi
-+
-+   kde_have_crypt=
+ if test $ac_cv_lib_compat_main = yes; then
+   LIBCOMPAT="-lcompat"
+ fi
+ 
+    kde_have_crypt=
+-   echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
 +echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcrypt  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_crypt_crypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22822,61 +23439,58 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char crypt ();
-+int
-+main ()
-+{
+ #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 crypt ();
+ int
+ main ()
+ {
+-crypt ();
 +return crypt ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39684,63 +25465,84 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_crypt_crypt=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypt_crypt=no
 +	ac_cv_lib_crypt_crypt=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
 +echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
-+if test $ac_cv_lib_crypt_crypt = yes; then
-+  LIBCRYPT="-lcrypt"; kde_have_crypt=yes
-+else
+ if test $ac_cv_lib_crypt_crypt = yes; then
+   LIBCRYPT="-lcrypt"; kde_have_crypt=yes
+ else
+-  echo "$as_me:$LINENO: checking for crypt in -lc" >&5
+-echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for crypt in -lc" >&5
 +echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_c_crypt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lc  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_c_crypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22889,56 +23503,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char crypt ();
-+int
-+main ()
-+{
+ #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 crypt ();
+ int
+ main ()
+ {
+-crypt ();
 +return crypt ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39748,90 +25550,74 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_c_crypt=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_c_crypt=no
 +	ac_cv_lib_c_crypt=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
 +echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; }
-+if test $ac_cv_lib_c_crypt = yes; then
-+  kde_have_crypt=yes
-+else
-+
-+        { echo "$as_me:$LINENO: WARNING: you have no crypt in either libcrypt or libc.
-+You should install libcrypt from another source or configure with PAM
-+support" >&5
-+echo "$as_me: WARNING: you have no crypt in either libcrypt or libc.
-+You should install libcrypt from another source or configure with PAM
-+support" >&2;}
-+	kde_have_crypt=no
-+
-+fi
-+
-+fi
-+
-+
-+   if test $kde_have_crypt = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_CRYPT 1
-+_ACEOF
-+
-+   fi
-+
+ if test $ac_cv_lib_c_crypt = yes; then
+   kde_have_crypt=yes
+ else
+@@ -22964,13 +23575,13 @@
+ 
+    fi
+ 
+-   echo "$as_me:$LINENO: checking for socklen_t" >&5
+-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for socklen_t" >&5
 +echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
-+   if test "${kde_cv_socklen_t+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
+    if test "${kde_cv_socklen_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-      ac_ext=cc
 +      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      kde_cv_socklen_t=no
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+         #include <sys/types.h>
-+         #include <sys/socket.h>
-+
-+int
-+main ()
-+{
-+
-+         socklen_t len;
-+         getpeername(0,0,&len);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -22999,27 +23610,22 @@
+ }
+ _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;;
@@ -39839,75 +25625,73 @@
 +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
+   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_cxx_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_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
+@@ -23028,8 +23634,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
-+         kde_cv_socklen_t=yes
-+         kde_cv_socklen_t_equiv=socklen_t
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+      ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
+       ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -23039,17 +23647,17 @@
+ 
+ fi
+ 
+-   echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
+-echo "${ECHO_T}$kde_cv_socklen_t" >&6
 +   { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
 +echo "${ECHO_T}$kde_cv_socklen_t" >&6; }
-+   if test $kde_cv_socklen_t = no; then
+    if test $kde_cv_socklen_t = no; then
+-      echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
+-echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6
 +      { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
 +echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; }
-+      if test "${kde_cv_socklen_t_equiv+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+         kde_cv_socklen_t_equiv=int
+       if test "${kde_cv_socklen_t_equiv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+          kde_cv_socklen_t_equiv=int
+-         ac_ext=cc
 +         ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+         for t in int size_t unsigned long "unsigned long"; do
-+            cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+               #include <sys/types.h>
-+               #include <sys/socket.h>
-+
-+int
-+main ()
-+{
-+
-+               $t len;
-+               getpeername(0,0,&len);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -23078,27 +23686,22 @@
+ }
+ _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;;
@@ -39915,81 +25699,92 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
+ 
+                kde_cv_socklen_t_equiv="$t"
+                break
+@@ -23107,8 +23710,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
-+               kde_cv_socklen_t_equiv="$t"
-+               break
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+         done
-+         ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
+          done
+          ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23119,8 +23724,8 @@
+ 
+ fi
+ 
+-      echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
+-echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
 +echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; }
-+   fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define kde_socklen_t $kde_cv_socklen_t_equiv
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define ksize_t $kde_cv_socklen_t_equiv
-+_ACEOF
-+
-+
+    fi
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -23133,8 +23738,8 @@
+ _ACEOF
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldnet  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23147,63 +23752,60 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dnet_ntoa ();
-+int
-+main ()
-+{
+ #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 dnet_ntoa ();
+ int
+ main ()
+ {
+-dnet_ntoa ();
 +return dnet_ntoa ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39997,65 +25792,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dnet_dnet_ntoa=no
 +	ac_cv_lib_dnet_dnet_ntoa=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-+fi
-+
-+   if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 +      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldnet_stub  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23216,63 +23818,60 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dnet_ntoa ();
-+int
-+main ()
-+{
+ #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 dnet_ntoa ();
+ int
+ main ()
+ {
+-dnet_ntoa ();
 +return dnet_ntoa ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40063,86 +25879,100 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dnet_stub_dnet_ntoa=no
 +	ac_cv_lib_dnet_stub_dnet_ntoa=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-+if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-+fi
-+
-+   fi
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+ 
+    fi
+-   echo "$as_me:$LINENO: checking for inet_ntoa" >&5
+-echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for inet_ntoa" >&5
 +echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; }
-+if test "${ac_cv_func_inet_ntoa+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define inet_ntoa to an innocuous variant, in case <limits.h> declares inet_ntoa.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define inet_ntoa innocuous_inet_ntoa
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char inet_ntoa (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef inet_ntoa
-+
+ if test "${ac_cv_func_inet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23299,72 +23898,63 @@
+ 
+ #undef inet_ntoa
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char inet_ntoa ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 inet_ntoa ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa)
 +#if defined __stub_inet_ntoa || defined __stub___inet_ntoa
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = inet_ntoa;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != inet_ntoa;
 +return inet_ntoa ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40150,61 +25980,82 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_func_inet_ntoa=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_inet_ntoa=no
 +	ac_cv_func_inet_ntoa=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
 +echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; }
-+
-+   if test $ac_cv_func_inet_ntoa = no; then
+ 
+    if test $ac_cv_func_inet_ntoa = no; then
+-     echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
+-echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
 +echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23377,63 +23967,60 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char inet_ntoa ();
-+int
-+main ()
-+{
+ #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 inet_ntoa ();
+ int
+ main ()
+ {
+-inet_ntoa ();
 +return inet_ntoa ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40212,86 +26063,100 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_nsl_inet_ntoa=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_nsl_inet_ntoa=no
 +	ac_cv_lib_nsl_inet_ntoa=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
 +echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; }
-+if test $ac_cv_lib_nsl_inet_ntoa = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-+fi
-+
-+   fi
+ if test $ac_cv_lib_nsl_inet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+    fi
+-   echo "$as_me:$LINENO: checking for connect" >&5
+-echo $ECHO_N "checking for connect... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for connect" >&5
 +echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
-+if test "${ac_cv_func_connect+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define connect innocuous_connect
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char connect (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef connect
-+
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23460,72 +24047,63 @@
+ 
+ #undef connect
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char connect ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 connect ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_connect) || defined (__stub___connect)
 +#if defined __stub_connect || defined __stub___connect
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = connect;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != connect;
 +return connect ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40299,61 +26164,82 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_func_connect=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_connect=no
 +	ac_cv_func_connect=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-echo "${ECHO_T}$ac_cv_func_connect" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
 +echo "${ECHO_T}$ac_cv_func_connect" >&6; }
-+
-+   if test $ac_cv_func_connect = no; then
+ 
+    if test $ac_cv_func_connect = no; then
+-      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 +      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_socket_connect+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23538,64 +24116,61 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char connect ();
-+int
-+main ()
-+{
+ #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 connect ();
+ int
+ main ()
+ {
+-connect ();
 +return connect ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40361,87 +26247,101 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_socket_connect=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_socket_connect=no
 +	ac_cv_lib_socket_connect=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
-+if test $ac_cv_lib_socket_connect = yes; then
-+  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-+fi
-+
-+   fi
-+
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+ 
+    fi
+ 
+-   echo "$as_me:$LINENO: checking for remove" >&5
+-echo $ECHO_N "checking for remove... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for remove" >&5
 +echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
-+if test "${ac_cv_func_remove+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define remove innocuous_remove
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char remove (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef remove
-+
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23622,72 +24197,63 @@
+ 
+ #undef remove
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char remove ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 remove ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_remove) || defined (__stub___remove)
 +#if defined __stub_remove || defined __stub___remove
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = remove;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != remove;
 +return remove ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40449,61 +26349,82 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_func_remove=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_remove=no
 +	ac_cv_func_remove=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-echo "${ECHO_T}$ac_cv_func_remove" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
 +echo "${ECHO_T}$ac_cv_func_remove" >&6; }
-+
-+   if test $ac_cv_func_remove = no; then
+ 
+    if test $ac_cv_func_remove = no; then
+-      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 +      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_posix_remove+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lposix  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23700,56 +24266,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char remove ();
-+int
-+main ()
-+{
+ #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 remove ();
+ int
+ main ()
+ {
+-remove ();
 +return remove ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40511,88 +26432,102 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_posix_remove=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_posix_remove=no
 +	ac_cv_lib_posix_remove=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
-+if test $ac_cv_lib_posix_remove = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-+fi
-+
-+   fi
-+
-+   # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+@@ -23757,8 +24320,8 @@
+    fi
+ 
+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-   echo "$as_me:$LINENO: checking for shmat" >&5
+-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for shmat" >&5
 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
-+if test "${ac_cv_func_shmat+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define shmat innocuous_shmat
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char shmat (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef shmat
-+
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23785,73 +24348,64 @@
+ 
+ #undef shmat
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shmat ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 shmat ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_shmat) || defined (__stub___shmat)
 +#if defined __stub_shmat || defined __stub___shmat
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = shmat;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != shmat;
 +return shmat ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40600,62 +26535,83 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_func_shmat=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_shmat=no
 +	ac_cv_func_shmat=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+-echo "${ECHO_T}$ac_cv_func_shmat" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
 +echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
-+if test $ac_cv_func_shmat = yes; then
-+  :
-+else
+ if test $ac_cv_func_shmat = yes; then
+   :
+ else
+-  echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lipc  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23864,56 +24418,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shmat ();
-+int
-+main ()
-+{
+ #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 shmat ();
+ int
+ main ()
+ {
+-shmat ();
 +return shmat ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40663,66 +26619,85 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_ipc_shmat=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ipc_shmat=no
 +	ac_cv_lib_ipc_shmat=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
-+if test $ac_cv_lib_ipc_shmat = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-+fi
-+
-+fi
-+
-+
-+   # more headers that need to be explicitly included on darwin
-+
-+
-+for ac_header in sys/types.h stdint.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+@@ -23927,18 +24478,19 @@
+ for ac_header in sys/types.h stdint.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23949,41 +24501,37 @@
+ #include <$ac_header>
+ _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;;
@@ -40730,38 +26705,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23992,24 +24540,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40769,102 +26765,109 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24017,9 +24563,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24043,25 +24590,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+   # sys/bitypes.h is needed for uint32_t and friends on Tru64
-+
-+for ac_header in sys/bitypes.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24079,18 +24620,19 @@
+ for ac_header in sys/bitypes.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24101,41 +24643,37 @@
+ #include <$ac_header>
+ _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;;
@@ -40872,38 +26875,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24144,24 +24682,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40911,105 +26935,112 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24169,9 +24705,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24195,25 +24732,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+   # darwin requires a poll emulation library
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24227,8 +24758,8 @@
+ 
+ 
+    # darwin requires a poll emulation library
+-   echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
+-echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
 +echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_poll_poll+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpoll  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_poll_poll+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24241,56 +24772,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char poll ();
-+int
-+main ()
-+{
+ #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 poll ();
+ int
+ main ()
+ {
+-poll ();
 +return poll ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -41017,63 +27048,85 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_poll_poll=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_poll_poll=no
 +	ac_cv_lib_poll_poll=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
+-echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
 +echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
-+if test $ac_cv_lib_poll_poll = yes; then
-+  LIB_POLL="-lpoll"
-+fi
-+
-+
-+   # for some image handling on Mac OS X
-+
-+for ac_header in Carbon/Carbon.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if test $ac_cv_lib_poll_poll = yes; then
+   LIB_POLL="-lpoll"
+ fi
+@@ -24301,18 +24829,19 @@
+ for ac_header in Carbon/Carbon.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24323,41 +24852,37 @@
+ #include <$ac_header>
+ _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;;
@@ -41081,38 +27134,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24366,24 +24891,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -41120,97 +27194,105 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24391,9 +24914,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24417,25 +24941,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+   # CoreAudio framework
-+   if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24450,17 +24968,17 @@
+ 
+    # CoreAudio framework
+    if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
 +echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
 +echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
+-echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
 +echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <CoreAudio/CoreAudio.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24471,41 +24989,37 @@
+ #include <CoreAudio/CoreAudio.h>
+ _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;;
@@ -41218,38 +27300,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
+-echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
 +echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <CoreAudio/CoreAudio.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24514,24 +25028,22 @@
+ /* end confdefs.h.  */
+ #include <CoreAudio/CoreAudio.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -41257,104 +27360,90 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24539,9 +25051,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24565,25 +25078,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
 +echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
 +echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_COREAUDIO 1
-+_ACEOF
-+
-+     FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
-+
-+fi
-+
-+
-+
-+
+ 
+ fi
+ if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
+@@ -24600,8 +25106,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
+-echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
 +echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; }
-+  kde_libs_safe="$LIBS"
-+  LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+
-+int
-+main ()
-+{
-+
-+      res_init();
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   kde_libs_safe="$LIBS"
+   LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -24627,31 +25133,27 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -41362,85 +27451,88 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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"
+ 
+       LIBRESOLV="-lresolv"
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +      { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_RES_INIT 1
-+_ACEOF
-+
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_RES_INIT 1
+@@ -24662,25 +25164,25 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +	 { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  LIBS=$kde_libs_safe
-+
-+
-+
+       conftest$ac_exeext conftest.$ac_ext
+   LIBS=$kde_libs_safe
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for res_init" >&5
+-echo $ECHO_N "checking for res_init... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for res_init" >&5
 +echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
-+if test "${kde_cv_func_res_init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+
-+
-+int
-+main ()
-+{
-+
-+res_init()
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -24692,9 +25194,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24720,35 +25219,31 @@
+ }
+ _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;;
@@ -41448,99 +27540,75 @@
 +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
+   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_cxx_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_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
-+
+   kde_cv_func_res_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_res_init=no
 +	kde_cv_func_res_init=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -24761,11 +25256,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
+-echo "${ECHO_T}$kde_cv_func_res_init" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
 +echo "${ECHO_T}$kde_cv_func_res_init" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
+-echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
 +echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; }
-+if test "${kde_cv_proto_res_init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_res_init" = xyes; then
-+  kde_cv_proto_res_init=no
-+else
-+  case "res_init" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_res_init="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_res_init=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_res_init" = xunknown; then
-+
-+
+ if test "${kde_cv_proto_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24786,8 +25281,7 @@
+ if test "x$kde_cv_proto_res_init" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+
-+
-+extern "C" int res_init(void);
-+
-+int
-+main ()
-+{
-+
-+res_init()
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -24825,37 +25319,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -41548,97 +27616,94 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
-+
+    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
+ 
+-kde_cv_proto_res_init="res_init unavailable"
 +	kde_cv_proto_res_init="res_init unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -24868,8 +25359,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
+-echo "${ECHO_T}$kde_cv_proto_res_init" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
 +echo "${ECHO_T}$kde_cv_proto_res_init" >&6; }
-+
-+if test "x$kde_cv_func_res_init" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_RES_INIT 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_res_init" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_RES_INIT_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
-+   LIBSOCKET="$X_EXTRA_LIBS"
-+
-+
+ 
+ if test "x$kde_cv_func_res_init" = xyes; then
+ 
+@@ -24896,8 +25387,8 @@
+    LIBSOCKET="$X_EXTRA_LIBS"
+ 
+ 
+-   echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
+-echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
 +echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ucb_killpg+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lucb  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_ucb_killpg+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24910,69 +25401,66 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char killpg ();
-+int
-+main ()
-+{
+ #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 killpg ();
+ int
+ main ()
+ {
+-killpg ();
 +return killpg ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -41646,71 +27711,96 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_ucb_killpg=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ucb_killpg=no
 +	ac_cv_lib_ucb_killpg=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
+-echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
 +echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; }
-+if test $ac_cv_lib_ucb_killpg = yes; then
-+  LIBUCB="-lucb"
-+fi
-+
-+
-+   case $host in     *-*-lynxos* )
+ if test $ac_cv_lib_ucb_killpg = yes; then
+   LIBUCB="-lucb"
+ fi
+ 
+ 
+    case $host in     *-*-lynxos* )
+-        echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
+-echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6
 +        { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
 +echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; }
-+        CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
+         CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
+-        echo "$as_me:$LINENO: result: disabled" >&5
+-echo "${ECHO_T}disabled" >&6
+-        echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 +        { echo "$as_me:$LINENO: result: disabled" >&5
 +echo "${ECHO_T}disabled" >&6; }
 +        { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lbsd  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24985,64 +25473,61 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char gethostbyname ();
-+int
-+main ()
-+{
+ #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 gethostbyname ();
+ int
+ main ()
+ {
+-gethostbyname ();
 +return gethostbyname ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -41718,61 +27808,82 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_bsd_gethostbyname=no
 +	ac_cv_lib_bsd_gethostbyname=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
-+if test $ac_cv_lib_bsd_gethostbyname = yes; then
-+  LIBSOCKET="-lbsd"
-+fi
-+          ;;
-+    esac
-+
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   LIBSOCKET="-lbsd"
+ fi
+           ;;
+     esac
+ 
+-     echo "$as_me:$LINENO: checking for int" >&5
+-echo $ECHO_N "checking for int... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for int" >&5
 +echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-+if test "${ac_cv_type_int+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_type_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25053,61 +25538,57 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +typedef int ac__type_new_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-if ((int *) 0)
 +if ((ac__type_new_ *) 0)
-+  return 0;
+   return 0;
+-if (sizeof (int))
 +if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -41780,58 +27891,84 @@
 +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
+   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
 +  (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
-+
+   ac_cv_type_int=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_int=no
 +	ac_cv_type_int=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_type_int" >&5
+-echo "${ECHO_T}$ac_cv_type_int" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
 +echo "${ECHO_T}$ac_cv_type_int" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking size of int" >&5
+-echo $ECHO_N "checking size of int... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of int" >&5
 +echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_int+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_sizeof_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_int" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25117,10 +25598,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef int ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -25128,27 +25610,22 @@
+ }
+ _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;;
@@ -41839,36 +27976,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -25158,10 +25635,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef int ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -25169,56 +25647,53 @@
+ }
+ _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;;
@@ -41876,53 +28028,78 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef int ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -25226,27 +25701,22 @@
+ }
+ _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;;
@@ -41930,36 +28107,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -25256,10 +25726,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef int ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -25267,50 +25738,48 @@
+ }
+ _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;;
@@ -41967,63 +28159,87 @@
 +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
+   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
 +  (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
-+
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
 +	ac_lo= ac_hi=
-+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
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# 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`
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ # 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`
+@@ -25321,10 +25790,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef int ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -25332,52 +25802,45 @@
+ }
+ _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;;
@@ -42031,78 +28247,116 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_int=$ac_lo;;
+ done
+ case $ac_lo in
+ ?*) 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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
 +   else
 +     ac_cv_sizeof_int=0
 +   fi ;;
-+esac
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ 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.  */
+ _ACEOF
+@@ -25385,8 +25848,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_;
 +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
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25395,35 +25859,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (int))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
 +  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -42110,73 +28364,85 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_sizeof_int=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25434,28 +25907,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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-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
-+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
-+fi
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_int=0
+-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
 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
 +
 +
 +
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_INT $ac_cv_sizeof_int
-+_ACEOF
-+
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+ 
+-   echo "$as_me:$LINENO: checking for short" >&5
+-echo $ECHO_N "checking for short... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for short" >&5
 +echo $ECHO_N "checking for short... $ECHO_C" >&6; }
-+if test "${ac_cv_type_short+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_type_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25466,61 +25942,57 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +typedef short ac__type_new_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-if ((short *) 0)
 +if ((ac__type_new_ *) 0)
-+  return 0;
+   return 0;
+-if (sizeof (short))
 +if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -42184,58 +28450,84 @@
 +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
+   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
 +  (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
-+
+   ac_cv_type_short=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_short=no
 +	ac_cv_type_short=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_type_short" >&5
+-echo "${ECHO_T}$ac_cv_type_short" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
 +echo "${ECHO_T}$ac_cv_type_short" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking size of short" >&5
+-echo $ECHO_N "checking size of short... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of short" >&5
 +echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_short+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_sizeof_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_short" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25530,10 +26002,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef short ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -25541,27 +26014,22 @@
+ }
+ _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;;
@@ -42243,36 +28535,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -25571,10 +26039,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef short ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -25582,56 +26051,53 @@
+ }
+ _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;;
@@ -42280,53 +28587,78 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef short ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -25639,27 +26105,22 @@
+ }
+ _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;;
@@ -42334,36 +28666,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -25669,10 +26130,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef short ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -25680,50 +26142,48 @@
+ }
+ _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;;
@@ -42371,63 +28718,87 @@
 +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
+   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
 +  (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
-+
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
 +	ac_lo= ac_hi=
-+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
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# 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`
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ # 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`
+@@ -25734,10 +26194,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef short ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -25745,52 +26206,45 @@
+ }
+ _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;;
@@ -42435,78 +28806,116 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_short=$ac_lo;;
+ done
+ case $ac_lo in
+ ?*) 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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
 +   else
 +     ac_cv_sizeof_short=0
 +   fi ;;
-+esac
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ 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.  */
+ _ACEOF
+@@ -25798,8 +26252,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_;
 +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
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25808,35 +26263,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (short))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
 +  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -42514,73 +28923,85 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_sizeof_short=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25847,28 +26311,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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-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
-+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
-+fi
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_short=0
+ fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
 +
 +
 +
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SHORT $ac_cv_sizeof_short
-+_ACEOF
-+
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
+ 
+-  echo "$as_me:$LINENO: checking for long" >&5
+-echo $ECHO_N "checking for long... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for long" >&5
 +echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-+if test "${ac_cv_type_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_type_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25879,61 +26346,57 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +typedef long ac__type_new_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-if ((long *) 0)
 +if ((ac__type_new_ *) 0)
-+  return 0;
+   return 0;
+-if (sizeof (long))
 +if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -42588,58 +29009,84 @@
 +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
+   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
 +  (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
-+
+   ac_cv_type_long=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_long=no
 +	ac_cv_type_long=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_type_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
 +echo "${ECHO_T}$ac_cv_type_long" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of long" >&5
 +echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_sizeof_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25943,10 +26406,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -25954,27 +26418,22 @@
+ }
+ _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;;
@@ -42647,36 +29094,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -25984,10 +26443,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -25995,56 +26455,53 @@
+ }
+ _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;;
@@ -42684,53 +29146,78 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -26052,27 +26509,22 @@
+ }
+ _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;;
@@ -42738,36 +29225,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -26082,10 +26534,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -26093,50 +26546,48 @@
+ }
+ _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;;
@@ -42775,63 +29277,87 @@
 +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
+   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
 +  (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
-+
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
 +	ac_lo= ac_hi=
-+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
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# 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`
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ # 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`
+@@ -26147,10 +26598,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -26158,52 +26610,45 @@
+ }
+ _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;;
@@ -42839,78 +29365,116 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_long=$ac_lo;;
+ done
+ case $ac_lo in
+ ?*) 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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
 +   else
 +     ac_cv_sizeof_long=0
 +   fi ;;
-+esac
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ 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.  */
+ _ACEOF
+@@ -26211,8 +26656,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_;
 +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
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26221,35 +26667,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (long))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
 +  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -42918,73 +29482,85 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_sizeof_long=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26260,28 +26715,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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-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
-+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
-+fi
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_long=0
+-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
 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
 +
 +
 +
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_LONG $ac_cv_sizeof_long
-+_ACEOF
-+
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+ 
+-  echo "$as_me:$LINENO: checking for char *" >&5
+-echo $ECHO_N "checking for char *... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for char *" >&5
 +echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
-+if test "${ac_cv_type_char_p+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_type_char_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26292,61 +26750,57 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +typedef char * ac__type_new_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-if ((char * *) 0)
 +if ((ac__type_new_ *) 0)
-+  return 0;
+   return 0;
+-if (sizeof (char *))
 +if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -42992,58 +29568,84 @@
 +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
+   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
 +  (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
-+
+   ac_cv_type_char_p=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_char_p=no
 +	ac_cv_type_char_p=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_type_char_p" >&5
+-echo "${ECHO_T}$ac_cv_type_char_p" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
 +echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking size of char *" >&5
+-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of char *" >&5
 +echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_char_p+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_sizeof_char_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_char_p" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26356,10 +26810,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef char * ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -26367,27 +26822,22 @@
+ }
+ _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;;
@@ -43051,36 +29653,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -26397,10 +26847,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef char * ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -26408,56 +26859,53 @@
+ }
+ _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;;
@@ -43088,53 +29705,78 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef char * ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -26465,27 +26913,22 @@
+ }
+ _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;;
@@ -43142,36 +29784,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -26495,10 +26938,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef char * ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -26506,50 +26950,48 @@
+ }
+ _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;;
@@ -43179,63 +29836,87 @@
 +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
+   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
 +  (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
-+
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
 +	ac_lo= ac_hi=
-+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
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# 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`
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ # 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`
+@@ -26560,10 +27002,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef char * ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -26571,52 +27014,45 @@
+ }
+ _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;;
@@ -43243,78 +29924,116 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_char_p=$ac_lo;;
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_char_p=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
 +'') if test "$ac_cv_type_char_p" = yes; then
 +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
-+See \`config.log' for more details." >&5
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
 +echo "$as_me: error: cannot compute sizeof (char *)
-+See \`config.log' for more details." >&2;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
 +   else
 +     ac_cv_sizeof_char_p=0
 +   fi ;;
-+esac
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ 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.  */
+ _ACEOF
+@@ -26624,8 +27060,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_;
 +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
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26634,35 +27071,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (char *))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (char *))))
+-	exit (1);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (char *))))
+-	exit (1);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
 +  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -43322,80 +30041,92 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_sizeof_char_p=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26673,30 +27119,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 *)
-+See \`config.log' for more details." >&5
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
 +echo "$as_me: error: cannot compute sizeof (char *)
-+See \`config.log' for more details." >&2;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-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
-+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
-+fi
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_char_p=0
+ fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
 +
 +
 +
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
-+_ACEOF
-+
-+
-+
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
+ _ACEOF
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26709,56 +27158,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
+ #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 dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
 +return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -43403,68 +30134,88 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_dl_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dl_dlopen=no
 +	ac_cv_lib_dl_dlopen=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+
-+LIBDL="-ldl"
-+ac_cv_have_dlfcn=yes
-+
-+fi
-+
-+
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ 
+ LIBDL="-ldl"
+@@ -26767,8 +27213,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
+-echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
 +echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26781,56 +27227,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shl_unload ();
-+int
-+main ()
-+{
+ #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 shl_unload ();
+ int
+ main ()
+ {
+-shl_unload ();
 +return shl_unload ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -43472,68 +30223,83 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_dld_shl_unload=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dld_shl_unload=no
 +	ac_cv_lib_dld_shl_unload=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
 +echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; }
-+if test $ac_cv_lib_dld_shl_unload = yes; then
-+
-+LIBDL="-ldld"
-+ac_cv_have_shload=yes
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
+ if test $ac_cv_lib_dld_shl_unload = yes; then
+ 
+ LIBDL="-ldld"
+@@ -26844,8 +27287,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking for size_t" >&5
+-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for size_t" >&5
 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-+if test "${ac_cv_type_size_t+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_type_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26856,61 +27299,57 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +typedef size_t ac__type_new_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-if ((size_t *) 0)
 +if ((ac__type_new_ *) 0)
-+  return 0;
+   return 0;
+-if (sizeof (size_t))
 +if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -43541,58 +30307,84 @@
 +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
+   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
 +  (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
-+
+   ac_cv_type_size_t=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_size_t=no
 +	ac_cv_type_size_t=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_type_size_t" >&5
+-echo "${ECHO_T}$ac_cv_type_size_t" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
 +echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking size of size_t" >&5
+-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of size_t" >&5
 +echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_size_t+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_sizeof_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_size_t" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26920,10 +27359,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef size_t ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -26931,27 +27371,22 @@
+ }
+ _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;;
@@ -43600,36 +30392,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -26961,10 +27396,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef size_t ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -26972,56 +27408,53 @@
+ }
+ _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;;
@@ -43637,53 +30444,78 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef size_t ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -27029,27 +27462,22 @@
+ }
+ _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;;
@@ -43691,36 +30523,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -27059,10 +27487,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef size_t ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -27070,50 +27499,48 @@
+ }
+ _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;;
@@ -43728,63 +30575,87 @@
 +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
+   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
 +  (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
-+
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
 +	ac_lo= ac_hi=
-+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
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# 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`
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ # 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`
+@@ -27124,10 +27551,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef size_t ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -27135,52 +27563,45 @@
+ }
+ _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;;
@@ -43792,78 +30663,116 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_size_t=$ac_lo;;
+ done
+ case $ac_lo in
+ ?*) 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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
 +   else
 +     ac_cv_sizeof_size_t=0
 +   fi ;;
-+esac
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ 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.  */
+ _ACEOF
+@@ -27188,8 +27609,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_;
 +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
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27198,35 +27620,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (size_t))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (size_t))))
+-	exit (1);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (size_t))))
+-	exit (1);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
 +  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -43871,74 +30780,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_sizeof_size_t=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27237,29 +27668,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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-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
-+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
-+fi
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_size_t=0
+-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
 +echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
 +
 +
 +
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-+_ACEOF
-+
-+
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
+ 
+ 
+-  echo "$as_me:$LINENO: checking for unsigned long" >&5
+-echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for unsigned long" >&5
 +echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
-+if test "${ac_cv_type_unsigned_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_type_unsigned_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27270,61 +27704,57 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +typedef unsigned long ac__type_new_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-if ((unsigned long *) 0)
 +if ((ac__type_new_ *) 0)
-+  return 0;
+   return 0;
+-if (sizeof (unsigned long))
 +if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -43946,58 +30867,84 @@
 +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
+   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
 +  (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
-+
+   ac_cv_type_unsigned_long=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_unsigned_long=no
 +	ac_cv_type_unsigned_long=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_type_unsigned_long" >&5
+-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
 +echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking size of unsigned long" >&5
+-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
 +echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_unsigned_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -27334,10 +27764,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef unsigned long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -27345,27 +27776,22 @@
+ }
+ _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;;
@@ -44005,36 +30952,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -27375,10 +27801,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef unsigned long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -27386,56 +27813,53 @@
+ }
+ _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;;
@@ -44042,53 +31004,78 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef unsigned long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -27443,27 +27867,22 @@
+ }
+ _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;;
@@ -44096,36 +31083,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -27473,10 +27892,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef unsigned long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -27484,50 +27904,48 @@
+ }
+ _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;;
@@ -44133,63 +31135,87 @@
 +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
+   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
 +  (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
-+
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
 +	ac_lo= ac_hi=
-+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
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# 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`
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ # 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`
+@@ -27538,10 +27956,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef unsigned long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -27549,52 +27968,45 @@
+ }
+ _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;;
@@ -44197,78 +31223,116 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
+ done
+ case $ac_lo in
+ ?*) 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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
 +   else
 +     ac_cv_sizeof_unsigned_long=0
 +   fi ;;
-+esac
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ 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.  */
+ _ACEOF
+@@ -27602,8 +28014,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_;
 +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
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27612,35 +28025,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (unsigned long))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (unsigned long))))
+-	exit (1);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (unsigned long))))
+-	exit (1);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
 +  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -44276,72 +31340,72 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_sizeof_unsigned_long=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27651,30 +28073,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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-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
-+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
-+fi
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_unsigned_long=0
+ fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
 +
 +
 +
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
-+_ACEOF
-+
-+
-+
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
+ _ACEOF
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
+-echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
 +echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; }
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+    #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
-+       choke me
-+    #endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27695,36 +28120,31 @@
+ }
+ _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;;
@@ -44349,76 +31413,75 @@
 +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
+   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
+-  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
-+  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
+ 
+ 
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +      { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+      { { 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!
-+      " >&5
-+echo "$as_me: 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!
-+      " >&2;}
-+   { (exit 1); exit 1; }; }
+       { { 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!
+@@ -27736,18 +28156,18 @@
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
-+fi
-+
 +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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_val_pie_support+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    safe_CXXFLAGS=$CXXFLAGS
-+    safe_LDFLAGS=$LDFLAGS
-+    CXXFLAGS="$CXXFLAGS -fPIE"
-+    LDFLAGS="$LDFLAGS -pie"
-+
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+int foo;
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -27777,35 +28197,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -44426,98 +31489,115 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
-+
+   kde_cv_val_pie_support=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_pie_support=no
 +	kde_cv_val_pie_support=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+
-+    CXXFLAGS=$safe_CXXFLAGS
-+    LDFLAGS=$safe_LDFLAGS
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ 
+     CXXFLAGS=$safe_CXXFLAGS
+@@ -27818,26 +28235,26 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
+-echo "${ECHO_T}$kde_cv_val_pie_support" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
 +echo "${ECHO_T}$kde_cv_val_pie_support" >&6; }
-+
+ 
+-  echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
+-echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
 +echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; }
-+
+ 
+-  # Check whether --enable-pie or --disable-pie was given.
 +  # Check whether --enable-pie was given.
-+if test "${enable_pie+set}" = set; then
+ if test "${enable_pie+set}" = set; then
+-  enableval="$enable_pie"
+-  kde_has_pie_support=$enableval
 +  enableval=$enable_pie; kde_has_pie_support=$enableval
-+else
-+  kde_has_pie_support=detect
+ else
+   kde_has_pie_support=detect
+-fi;
 +fi
 +
-+
-+  if test "$kde_has_pie_support" = "detect"; then
-+    kde_has_pie_support=$kde_cv_val_pie_support
-+  fi
-+
+ 
+   if test "$kde_has_pie_support" = "detect"; then
+     kde_has_pie_support=$kde_cv_val_pie_support
+   fi
+ 
+-  echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
+-echo "${ECHO_T}$kde_has_pie_support" >&6
 +  { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
 +echo "${ECHO_T}$kde_has_pie_support" >&6; }
-+
-+  KDE_USE_FPIE=""
-+  KDE_USE_PIE=""
-+
-+
-+
-+
-+  if test "$kde_has_pie_support" = "yes"; then
-+    KDE_USE_FPIE="-fPIE"
-+    KDE_USE_PIE="-pie"
-+  fi
-+
-+
-+# darwin needs this to initialize the environment
-+
-+for ac_header in crt_externs.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 
+   KDE_USE_FPIE=""
+   KDE_USE_PIE=""
+@@ -27856,18 +28273,19 @@
+ for ac_header in crt_externs.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27878,41 +28296,37 @@
+ #include <$ac_header>
+ _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;;
@@ -44525,38 +31605,60 @@
 +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
+   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=$?
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27921,24 +28335,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -44564,124 +31666,126 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27946,9 +28358,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -27972,25 +28385,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -28002,8 +28409,8 @@
+ 
+ done
+ 
+-echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
+-echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
 +echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; }
-+if test "${ac_cv_func__NSGetEnviron+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define _NSGetEnviron to an innocuous variant, in case <limits.h> declares _NSGetEnviron.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define _NSGetEnviron innocuous__NSGetEnviron
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char _NSGetEnviron (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef _NSGetEnviron
-+
+ if test "${ac_cv_func__NSGetEnviron+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28030,68 +28437,59 @@
+ 
+ #undef _NSGetEnviron
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char _NSGetEnviron ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 _NSGetEnviron ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron)
 +#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = _NSGetEnviron;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != _NSGetEnviron;
 +return _NSGetEnviron ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -44689,100 +31793,103 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_func__NSGetEnviron=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func__NSGetEnviron=no
 +	ac_cv_func__NSGetEnviron=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
+-echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
 +echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; }
-+if test $ac_cv_func__NSGetEnviron = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_NSGETENVIRON 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_func in vsnprintf snprintf
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ if test $ac_cv_func__NSGetEnviron = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -28112,9 +28510,9 @@
+ for ac_func in vsnprintf snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -28140,68 +28538,60 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -44790,125 +31897,113 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+
-+
-+
-+
-+
-+
-+
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -28218,32 +28608,32 @@
+ 
+ 
+ 
+-# Check whether --enable-embedded or --disable-embedded was given.
 +# Check whether --enable-embedded was given.
-+if test "${enable_embedded+set}" = set; then
+ if test "${enable_embedded+set}" = set; then
+-  enableval="$enable_embedded"
+-  kde_use_qt_emb=$enableval
 +  enableval=$enable_embedded; kde_use_qt_emb=$enableval
-+else
-+  kde_use_qt_emb=no
-+
+ else
+   kde_use_qt_emb=no
+ 
+-fi;
 +fi
 +
-+
+ 
+-# Check whether --enable-qtopia or --disable-qtopia was given.
 +# Check whether --enable-qtopia was given.
-+if test "${enable_qtopia+set}" = set; then
+ if test "${enable_qtopia+set}" = set; then
+-  enableval="$enable_qtopia"
+-  kde_use_qt_emb_palm=$enableval
 +  enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval
-+else
-+  kde_use_qt_emb_palm=no
-+
+ else
+   kde_use_qt_emb_palm=no
+ 
+-fi;
 +fi
 +
-+
+ 
+-# Check whether --enable-mac or --disable-mac was given.
 +# Check whether --enable-mac was given.
-+if test "${enable_mac+set}" = set; then
+ if test "${enable_mac+set}" = set; then
+-  enableval="$enable_mac"
+-  kde_use_qt_mac=$enableval
 +  enableval=$enable_mac; kde_use_qt_mac=$enableval
-+else
-+  kde_use_qt_mac=no
-+
+ else
+   kde_use_qt_mac=no
+ 
+-fi;
 +fi
 +
-+
-+# used to disable x11-specific stuff on special platforms
-+
-+
-+if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-+  include_x11_TRUE=
-+  include_x11_FALSE='#'
-+else
-+  include_x11_TRUE='#'
-+  include_x11_FALSE=
-+fi
-+
-+
-+if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-+
+ 
+ # used to disable x11-specific stuff on special platforms
+ 
+@@ -28259,8 +28649,8 @@
+ 
+ if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
+ 
+-echo "$as_me:$LINENO: checking for X" >&5
+-echo $ECHO_N "checking for X... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for X" >&5
 +echo $ECHO_N "checking for X... $ECHO_C" >&6; }
-+
-+if test "${kde_cv_have_x+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # One or both of the vars are not set, and there is no cached value.
-+if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-+   kde_x_includes=NO
-+else
-+   kde_x_includes=$x_includes
-+fi
-+if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-+   kde_x_libraries=NO
-+else
-+   kde_x_libraries=$x_libraries
-+fi
-+
-+# below we use the standard autoconf calls
-+ac_x_libraries=$kde_x_libraries
-+ac_x_includes=$kde_x_includes
-+
-+
-+
-+
-+if test "$ac_x_includes" = NO; then
-+  # Guess where to find include files, by looking for this one X11 .h file.
-+  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-+
-+  # First, try using that file with no special directory specified.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$x_direct_test_include>
-+_ACEOF
+ 
+ if test "${kde_cv_have_x+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -28297,24 +28687,22 @@
+ /* end confdefs.h.  */
+ #include <$x_direct_test_include>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -44916,95 +32011,43 @@
 +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
+   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; 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
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   # We can compile using X headers with no special include directory.
+ ac_x_includes=
+ else
+@@ -28365,6 +28753,7 @@
+     fi
+   done
+ fi
 +
-+  # Look for the header file in a standard set of common directories.
-+# Check X11 before X11Rn because it is often a symlink to the current release.
-+  for ac_dir in               \
-+    /usr/X11/include          \
-+    /usr/X11R6/include        \
-+    /usr/X11R5/include        \
-+    /usr/X11R4/include        \
-+                              \
-+    /usr/include/X11          \
-+    /usr/include/X11R6        \
-+    /usr/include/X11R5        \
-+    /usr/include/X11R4        \
-+                              \
-+    /usr/local/X11/include    \
-+    /usr/local/X11R6/include  \
-+    /usr/local/X11R5/include  \
-+    /usr/local/X11R4/include  \
-+                              \
-+    /usr/local/include/X11    \
-+    /usr/local/include/X11R6  \
-+    /usr/local/include/X11R5  \
-+    /usr/local/include/X11R4  \
-+                              \
-+    /usr/X386/include         \
-+    /usr/x386/include         \
-+    /usr/XFree86/include/X11  \
-+                              \
-+    /usr/include              \
-+    /usr/local/include        \
-+    /usr/unsupported/include  \
-+    /usr/athena/include       \
-+    /usr/local/x11r5/include  \
-+    /usr/lpp/Xamples/include  \
-+                              \
-+    /usr/openwin/include      \
-+    /usr/openwin/share/include \
-+    ; \
-+  do
-+    if test -r "$ac_dir/$x_direct_test_include"; then
-+      ac_x_includes=$ac_dir
-+      break
-+    fi
-+  done
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+fi # $ac_x_includes = NO
-+
-+if test "$ac_x_libraries" = NO; then
-+  # Check for the libraries.
-+
-+  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-+  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-+
-+  # See if we find them without any special options.
-+  # Don't add to $LIBS permanently.
-+  ac_save_LIBS="$LIBS"
-+  LIBS="-l$x_direct_test_library $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Intrinsic.h>
-+int
-+main ()
-+{
-+${x_direct_test_function}(1)
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ rm -f conftest.err conftest.$ac_ext
+ fi # $ac_x_includes = NO
+ 
+@@ -28394,27 +28783,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45012,225 +32055,159 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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=
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+ ac_x_libraries=
+@@ -28422,7 +28807,7 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-LIBS="$ac_save_LIBS"
 +	LIBS="$ac_save_LIBS"
-+# 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}/` \
-+    /usr/X11/lib${kdelibsuff}           \
-+    /usr/X11R6/lib${kdelibsuff}         \
-+    /usr/X11R5/lib${kdelibsuff}         \
-+    /usr/X11R4/lib${kdelibsuff}         \
-+                                        \
-+    /usr/lib${kdelibsuff}/X11           \
-+    /usr/lib${kdelibsuff}/X11R6         \
-+    /usr/lib${kdelibsuff}/X11R5         \
-+    /usr/lib${kdelibsuff}/X11R4         \
-+                                        \
-+    /usr/local/X11/lib${kdelibsuff}     \
-+    /usr/local/X11R6/lib${kdelibsuff}   \
-+    /usr/local/X11R5/lib${kdelibsuff}   \
-+    /usr/local/X11R4/lib${kdelibsuff}   \
-+                                        \
-+    /usr/local/lib${kdelibsuff}/X11     \
-+    /usr/local/lib${kdelibsuff}/X11R6   \
-+    /usr/local/lib${kdelibsuff}/X11R5   \
-+    /usr/local/lib${kdelibsuff}/X11R4   \
-+                                        \
-+    /usr/X386/lib${kdelibsuff}          \
-+    /usr/x386/lib${kdelibsuff}          \
-+    /usr/XFree86/lib${kdelibsuff}/X11   \
-+                                        \
-+    /usr/lib${kdelibsuff}               \
-+    /usr/local/lib${kdelibsuff}         \
-+    /usr/unsupported/lib${kdelibsuff}   \
-+    /usr/athena/lib${kdelibsuff}        \
-+    /usr/local/x11r5/lib${kdelibsuff}   \
-+    /usr/lpp/Xamples/lib${kdelibsuff}   \
-+    /lib/usr/lib${kdelibsuff}/X11       \
-+                                        \
-+    /usr/openwin/lib${kdelibsuff}       \
-+    /usr/openwin/share/lib${kdelibsuff} \
-+    ; \
-+do
-+  for ac_extension in a so sl; do
-+    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-+      ac_x_libraries=$ac_dir
-+      break 2
-+    fi
-+  done
-+done
-+fi
+ # 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}/` \
+@@ -28470,7 +28855,8 @@
+   done
+ done
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi # $ac_x_libraries = NO
-+
-+case "$host" in
-+mips-sgi-irix6*)
-+  ;;
-+*-*-solaris*)
-+  ;;
-+*)
+       conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = NO
+ 
+@@ -28480,21 +28866,26 @@
+ *-*-solaris*)
+   ;;
+ *)
+-  rm -fr conftest.dir
 +  rm -f -r conftest.dir
-+if mkdir conftest.dir; then
-+  cd conftest.dir
-+  cat >Imakefile <<'_ACEOF'
+ if mkdir conftest.dir; then
+   cd conftest.dir
+-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+   cat >Imakefile <<'_ACEOF'
+-acfindx:
+-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
 +incroot:
 +	@echo incroot='${INCROOT}'
 +usrlibdir:
 +	@echo usrlibdir='${USRLIBDIR}'
 +libdir:
 +	@echo libdir='${LIBDIR}'
-+_ACEOF
+ _ACEOF
+-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
 +  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
 +    for ac_var in incroot usrlibdir libdir; do
 +      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
 +    done
-+    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-+    for ac_extension in a so sl; do
+     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+     for ac_extension in a so sl; do
+-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+-	 test -f $ac_im_libdir/libX11.$ac_extension; then
 +      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
 +	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
-+	ac_im_usrlibdir=$ac_im_libdir; break
-+      fi
-+    done
-+    # Screen out bogus values from the imake configuration.  They are
-+    # 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
+ 	ac_im_usrlibdir=$ac_im_libdir; break
+       fi
+     done
+@@ -28502,7 +28893,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
+-	/usr/include) ;;
 +	/usr/include) ac_x_includes= ;;
-+	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-+    esac
-+    case $ac_im_usrlibdir in
-+	/usr/lib | /lib) ;;
-+	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-+    esac
-+  fi
-+  cd ..
+ 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+     esac
+     case $ac_im_usrlibdir in
+@@ -28511,7 +28902,7 @@
+     esac
+   fi
+   cd ..
+-  rm -fr conftest.dir
 +  rm -f -r conftest.dir
-+fi
-+
-+  if test -z "$ac_x_includes"; then
-+    ac_x_includes="."
-+  fi
-+  if test -z "$ac_x_libraries"; then
-+    ac_x_libraries="/usr/lib${kdelibsuff}"
-+  fi
-+esac
-+#from now on we use our own again
-+
-+# when the user already gave --x-includes, we ignore
-+# what the standard autoconf macros told us.
-+if test "$kde_x_includes" = NO; then
-+  kde_x_includes=$ac_x_includes
-+fi
-+
-+# for --x-libraries too
-+if test "$kde_x_libraries" = NO; then
-+  kde_x_libraries=$ac_x_libraries
-+fi
-+
-+if test "$kde_x_includes" = NO; then
-+  { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
-+echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+if test "$kde_x_libraries" = NO; then
-+  { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
-+echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+# Record where we found X for the cache.
-+kde_cv_have_x="have_x=yes \
-+         kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-+
-+fi
-+
-+eval "$kde_cv_have_x"
-+
-+if test "$have_x" != yes; then
+ fi
+ 
+   if test -z "$ac_x_includes"; then
+@@ -28555,12 +28946,12 @@
+ eval "$kde_cv_have_x"
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:$LINENO: result: $have_x" >&5
+-echo "${ECHO_T}$have_x" >&6
 +  { echo "$as_me:$LINENO: result: $have_x" >&5
 +echo "${ECHO_T}$have_x" >&6; }
-+  no_x=yes
-+else
+   no_x=yes
+ else
+-  echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
+-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
 +  { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
 +echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
-+fi
-+
-+if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-+  X_INCLUDES=""
-+  x_includes=".";  else
-+  x_includes=$kde_x_includes
-+  X_INCLUDES="-I$x_includes"
-+fi
-+
-+if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
-+  X_LDFLAGS=""
-+  x_libraries="/usr/lib";  else
-+  x_libraries=$kde_x_libraries
-+  X_LDFLAGS="-L$x_libraries"
-+fi
-+all_includes="$X_INCLUDES"
-+all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS"
-+
-+# Check for libraries that X11R6 Xt/Xaw programs need.
-+ac_save_LDFLAGS="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $X_LDFLAGS"
-+# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-+# check for ICE first), but we must link in the order -lSM -lICE or
-+# we get undefined symbols.  So assume we have SM if we have ICE.
-+# 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.
+ fi
+ 
+ if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
+@@ -28588,8 +28979,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.
+-echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28602,56 +28993,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char IceConnectionNumber ();
-+int
-+main ()
-+{
+ #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 IceConnectionNumber ();
+ int
+ main ()
+ {
+-IceConnectionNumber ();
 +return IceConnectionNumber ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45238,73 +32215,68 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ICE_IceConnectionNumber=no
 +	ac_cv_lib_ICE_IceConnectionNumber=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-+if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-+  LIBSM="-lSM -lICE"
-+fi
-+
-+LDFLAGS="$ac_save_LDFLAGS"
-+
-+LIB_X11='-lX11 $(LIBSOCKET)'
-+
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+   LIBSM="-lSM -lICE"
+ fi
+@@ -28660,8 +29048,8 @@
+ 
+ LIB_X11='-lX11 $(LIBSOCKET)'
+ 
+-echo "$as_me:$LINENO: checking for libXext" >&5
+-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for libXext" >&5
 +echo $ECHO_N "checking for libXext... $ECHO_C" >&6; }
-+if test "${kde_cv_have_libXext+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_ldflags_safe="$LDFLAGS"
-+kde_libs_safe="$LIBS"
-+
-+LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-+LIBS="-lXext -lX11 $LIBSOCKET"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <stdio.h>
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+
-+int
-+main ()
-+{
-+
-+printf("hello Xext\n");
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ if test "${kde_cv_have_libXext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28695,36 +29083,33 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45312,223 +32284,106 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   kde_cv_have_libXext=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_have_libXext=no
 +	kde_cv_have_libXext=no
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+
-+LDFLAGS=$kde_ldflags_safe
-+LIBS=$kde_libs_safe
-+
-+fi
-+
-+
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ LDFLAGS=$kde_ldflags_safe
+@@ -28733,8 +29118,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
+-echo "${ECHO_T}$kde_cv_have_libXext" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
 +echo "${ECHO_T}$kde_cv_have_libXext" >&6; }
-+
-+if test "$kde_cv_have_libXext" = "no"; then
-+  { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-+can't find it itself, we stop here assuming that make wouldn't find
-+them either." >&5
-+echo "$as_me: error: We need a working libXext to proceed. Since configure
-+can't find it itself, we stop here assuming that make wouldn't find
-+them either." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+LIB_XEXT="-lXext"
-+QTE_NORTTI=""
-+
-+elif test "$kde_use_qt_emb" = "yes"; then
-+    CPPFLAGS=-DQWS
-+  CXXFLAGS="$CXXFLAGS -fno-rtti"
-+  QTE_NORTTI="-fno-rtti -DQWS"
-+  X_PRE_LIBS=""
-+  LIB_X11=""
-+  LIB_XEXT=""
-+  LIB_XRENDER=""
-+  LIBSM=""
-+  X_INCLUDES=""
-+  X_LDFLAGS=""
-+  x_includes=""
-+  x_libraries=""
-+elif test "$kde_use_qt_mac" = "yes"; then
-+      CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
-+  CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
-+  X_PRE_LIBS=""
-+  LIB_X11=""
-+  LIB_XEXT=""
-+  LIB_XRENDER=""
-+  LIBSM=""
-+  X_INCLUDES=""
-+  X_LDFLAGS=""
-+  x_includes=""
-+  x_libraries=""
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+if test -z ""; then
-+  # Current default Qt version: 3.3
-+  kde_qtver=3
-+  kde_qtsubver=3
-+else
-+  kde_qtsubver=`echo "" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
-+  # following is the check if subversion isnt found in passed argument
-+  if test "$kde_qtsubver" = ""; then
-+    kde_qtsubver=1
-+  fi
-+  kde_qtver=`echo "" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
-+  if test "$kde_qtver" = "1"; then
-+    kde_qtsubver=42
-+  fi
-+fi
-+
-+if test -z ""; then
-+  if test "$kde_qtver" = "2"; then
-+    if test $kde_qtsubver -gt 0; then
-+      kde_qt_minversion=">= Qt 2.2.2"
-+    else
-+      kde_qt_minversion=">= Qt 2.0.2"
-+    fi
-+  fi
-+  if test "$kde_qtver" = "3"; then
-+    if test $kde_qtsubver -gt 0; then
-+	 if test $kde_qtsubver -gt 1; then
-+	    if test $kde_qtsubver -gt 2; then
-+		kde_qt_minversion=">= Qt 3.3 and < 4.0"
-+	    else
-+	        kde_qt_minversion=">= Qt 3.2 and < 4.0"
-+	    fi
-+	 else
-+            kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
-+         fi
-+    else
-+      kde_qt_minversion=">= Qt 3.0 and < 4.0"
-+    fi
-+  fi
-+  if test "$kde_qtver" = "1"; then
-+    kde_qt_minversion=">= 1.42 and < 2.0"
-+  fi
-+else
-+   kde_qt_minversion=""
-+fi
-+
-+if test -z ""; then
-+   if test $kde_qtver = 3; then
-+     if test $kde_qtsubver -gt 0; then
-+       kde_qt_verstring="QT_VERSION >= 0x03 at VER@00 && QT_VERSION < 0x040000"
-+       qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
-+       kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s, at VER@,$qtsubver,"`
-+     else
-+       kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
-+     fi
-+   fi
-+   if test $kde_qtver = 2; then
-+     if test $kde_qtsubver -gt 0; then
-+       kde_qt_verstring="QT_VERSION >= 222"
-+     else
-+       kde_qt_verstring="QT_VERSION >= 200"
-+     fi
-+   fi
-+   if test $kde_qtver = 1; then
-+    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-+   fi
-+else
-+   kde_qt_verstring=""
-+fi
-+
-+if test $kde_qtver = 4; then
-+  kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
-+fi
-+if test $kde_qtver = 3; then
-+  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
-+fi
-+if test $kde_qtver = 2; then
-+   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-+fi
-+if test $kde_qtver = 1; then
-+   kde_qt_dirs="$QTDIR /usr/lib/qt"
-+fi
-+
-+
-+                LIBPTHREAD=""
-+
-+  if test -n "$PTHREAD_LIBS"; then
-+    if test "x$PTHREAD_LIBS" = "x-pthread" ; then
-+      LIBPTHREAD="PTHREAD"
-+    else
-+      PTHREAD_LIBS_save="$PTHREAD_LIBS"
-+      PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
+ 
+ if test "$kde_cv_have_libXext" = "no"; then
+   { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
+@@ -28880,8 +29265,8 @@
+     else
+       PTHREAD_LIBS_save="$PTHREAD_LIBS"
+       PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
+-      echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
 +      { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
 +echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
-+     as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+ 
+      kde_save_LDFLAGS="$LDFLAGS"
+           kde_save_LIBS="$LIBS"
+@@ -28892,9 +29277,9 @@
+ 	;;
+      esac
+      as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
 +echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l$PTHREAD_LIBS  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -28906,56 +29291,54 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pthread_create ();
-+int
-+main ()
-+{
+ #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 pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
 +return pthread_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45536,73 +32391,89 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "$as_ac_Lib=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_Lib=no"
 +	eval "$as_ac_Lib=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Lib'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-+  LIBPTHREAD="$PTHREAD_LIBS_save"
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+      PTHREAD_LIBS="$PTHREAD_LIBS_save"
-+    fi
-+  fi
-+
-+    if test -z "$LIBPTHREAD"; then
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   LIBPTHREAD="$PTHREAD_LIBS_save"
+ fi
+@@ -28968,8 +29351,8 @@
+   fi
+ 
+     if test -z "$LIBPTHREAD"; then
+-    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpthread  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28982,56 +29365,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pthread_create ();
-+int
-+main ()
-+{
+ #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 pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
 +return pthread_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45610,57 +32481,68 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   ac_cv_lib_pthread_pthread_create=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_pthread_pthread_create=no
 +	ac_cv_lib_pthread_pthread_create=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
-+if test $ac_cv_lib_pthread_pthread_create = yes; then
-+  LIBPTHREAD="-lpthread"
-+fi
-+
-+  fi
-+
-+    if test -z "$LIBPTHREAD" ; then
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+   LIBPTHREAD="-lpthread"
+ fi
+@@ -29039,8 +29419,8 @@
+   fi
+ 
+     if test -z "$LIBPTHREAD" ; then
+-    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-+    kde_safe_libs=$LIBS
-+    LIBS="$LIBS -lpthread"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <pthread.h>
-+int
-+main ()
-+{
-+(void)pthread_create(0,0,0,0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+     kde_safe_libs=$LIBS
+     LIBS="$LIBS -lpthread"
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -29059,40 +29439,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45668,79 +32550,79 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
 +        { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+        LIBPTHREAD="-lpthread"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
+         LIBPTHREAD="-lpthread"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +	{ echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    LIBS=$kde_safe_libs
-+  fi
-+
-+    if test "x$LIBPTHREAD" = "xPTHREAD" ; then
-+    LIBPTHREAD=""
-+  fi
-+
-+
-+
-+
-+      USE_THREADS=""
-+      if test -z "$LIBPTHREAD"; then
-+
+       conftest$ac_exeext conftest.$ac_ext
+     LIBS=$kde_safe_libs
+   fi
+@@ -29107,16 +29484,15 @@
+       USE_THREADS=""
+       if test -z "$LIBPTHREAD"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
+-echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
 +echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; }
-+kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -pthread"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -29143,34 +29519,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45748,90 +32630,88 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -29183,13 +29557,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ USE_THREADS="-D_THREAD_SAFE -pthread"
-+else
+  :
+  USE_THREADS="-D_THREAD_SAFE -pthread"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+      fi
-+
-+
-+
-+    case $host_os in
-+ 	solaris*)
-+
+  :
+ 
+ fi
+@@ -29201,16 +29575,15 @@
+     case $host_os in
+  	solaris*)
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
+-echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
 +echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; }
-+kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -mt"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -29237,34 +29610,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45839,172 +32719,140 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -29277,13 +29648,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ USE_THREADS="-mt"
-+else
+  :
+  USE_THREADS="-mt"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+                CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
-+    		;;
-+        freebsd*)
-+                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
-+                ;;
-+        aix*)
-+                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-+                LIBPTHREAD="$LIBPTHREAD -lc_r"
-+                ;;
-+        linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-+                if test "$CXX" = "KCC"; then
-+                  CXXFLAGS="$CXXFLAGS --thread_safe"
-+		  NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
-+                fi
-+                ;;
-+	*)
-+		;;
-+    esac
-+
-+
-+
-+
+  :
+ 
+ fi
+@@ -29310,17 +29681,17 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for extra includes" >&5
+-echo $ECHO_N "checking for extra includes... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for extra includes" >&5
 +echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; }
-+
+ 
+-# Check whether --with-extra-includes or --without-extra-includes was given.
 +# Check whether --with-extra-includes was given.
-+if test "${with_extra_includes+set}" = set; then
+ if test "${with_extra_includes+set}" = set; then
+-  withval="$with_extra_includes"
+-  kde_use_extra_includes="$withval"
 +  withval=$with_extra_includes; kde_use_extra_includes="$withval"
-+else
-+  kde_use_extra_includes=NONE
-+
+ else
+   kde_use_extra_includes=NONE
+ 
+-fi;
 +fi
 +
-+kde_extra_includes=
-+if test -n "$kde_use_extra_includes" && \
-+   test "$kde_use_extra_includes" != "NONE"; then
-+
-+   ac_save_ifs=$IFS
-+   IFS=':'
-+   for dir in $kde_use_extra_includes; do
-+     kde_extra_includes="$kde_extra_includes $dir"
-+     USER_INCLUDES="$USER_INCLUDES -I$dir"
-+   done
-+   IFS=$ac_save_ifs
-+   kde_use_extra_includes="added"
-+else
-+   kde_use_extra_includes="no"
-+fi
-+
-+
+ kde_extra_includes=
+ if test -n "$kde_use_extra_includes" && \
+    test "$kde_use_extra_includes" != "NONE"; then
+@@ -29338,21 +29709,21 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
+-echo "${ECHO_T}$kde_use_extra_includes" >&6
 +{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
 +echo "${ECHO_T}$kde_use_extra_includes" >&6; }
-+
-+kde_extra_libs=
+ 
+ kde_extra_libs=
+-echo "$as_me:$LINENO: checking for extra libs" >&5
+-echo $ECHO_N "checking for extra libs... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for extra libs" >&5
 +echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; }
-+
+ 
+-# Check whether --with-extra-libs or --without-extra-libs was given.
 +# Check whether --with-extra-libs was given.
-+if test "${with_extra_libs+set}" = set; then
+ if test "${with_extra_libs+set}" = set; then
+-  withval="$with_extra_libs"
+-  kde_use_extra_libs=$withval
 +  withval=$with_extra_libs; kde_use_extra_libs=$withval
-+else
-+  kde_use_extra_libs=NONE
-+
+ else
+   kde_use_extra_libs=NONE
+ 
+-fi;
 +fi
 +
-+if test -n "$kde_use_extra_libs" && \
-+   test "$kde_use_extra_libs" != "NONE"; then
-+
-+   ac_save_ifs=$IFS
-+   IFS=':'
-+   for dir in $kde_use_extra_libs; do
-+     kde_extra_libs="$kde_extra_libs $dir"
-+     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
-+     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
-+   done
-+   IFS=$ac_save_ifs
-+   kde_use_extra_libs="added"
-+else
-+   kde_use_extra_libs="no"
-+fi
-+
-+
-+
+ if test -n "$kde_use_extra_libs" && \
+    test "$kde_use_extra_libs" != "NONE"; then
+ 
+@@ -29371,14 +29742,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
+-echo "${ECHO_T}$kde_use_extra_libs" >&6
 +{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
 +echo "${ECHO_T}$kde_use_extra_libs" >&6; }
-+
-+
-+
-+
+ 
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for libz" >&5
+-echo $ECHO_N "checking for libz... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for libz" >&5
 +echo $ECHO_N "checking for libz... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_z+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
-+kde_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include<zlib.h>
-+
-+int
-+main ()
-+{
-+
-+  char buf[42];
-+  gzFile f = (gzFile) 0;
-+  /* this would segfault.. but we only link, don't run */
-+  (void) gzgets(f, buf, sizeof(buf));
-+
-+  return (zlibVersion() == ZLIB_VERSION);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ if test "${ac_cv_lib_z+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29412,35 +29783,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -46012,95 +32860,72 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "ac_cv_lib_z='-lz'"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_z=no"
 +	eval "ac_cv_lib_z=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS="$kde_save_LIBS"
-+CFLAGS="$kde_save_CFLAGS"
-+
-+fi
-+if test ! "$ac_cv_lib_z" = no; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBZ 1
-+_ACEOF
-+
-+  LIBZ="$ac_cv_lib_z"
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29453,8 +29821,8 @@
+ _ACEOF
+ 
+   LIBZ="$ac_cv_lib_z"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
+-echo "${ECHO_T}$ac_cv_lib_z" >&6
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
 +echo "${ECHO_T}$ac_cv_lib_z" >&6; }
-+else
-+  { { echo "$as_me:$LINENO: error: not found.
-+          Possibly configure picks up an outdated version
-+          installed by XFree86. Remove it from your system.
-+
-+          Check your installation and look into config.log" >&5
-+echo "$as_me: error: not found.
-+          Possibly configure picks up an outdated version
-+          installed by XFree86. Remove it from your system.
-+
-+          Check your installation and look into config.log" >&2;}
-+   { (exit 1); exit 1; }; }
-+  LIBZ=""
-+fi
-+
-+
-+
-+
-+
+ else
+   { { echo "$as_me:$LINENO: error: not found.
+           Possibly configure picks up an outdated version
+@@ -29474,8 +29842,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for libpng" >&5
+-echo $ECHO_N "checking for libpng... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for libpng" >&5
 +echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_png+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-+else
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-+fi
-+kde_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+    #include<png.h>
-+
-+int
-+main ()
-+{
-+
-+    png_structp png_ptr = png_create_read_struct(  /* image ptr */
-+		PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-+    return( png_ptr != 0 );
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ if test "${ac_cv_lib_png+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29511,36 +29879,33 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -46108,84 +32933,77 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_png=no"
 +	eval "ac_cv_lib_png=no"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS="$kde_save_LIBS"
-+CFLAGS="$kde_save_CFLAGS"
-+
-+fi
-+if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBPNG 1
-+_ACEOF
-+
-+  LIBPNG="$ac_cv_lib_png"
-+
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29554,19 +29919,19 @@
+ 
+   LIBPNG="$ac_cv_lib_png"
+ 
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
+-echo "${ECHO_T}$ac_cv_lib_png" >&6
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
 +echo "${ECHO_T}$ac_cv_lib_png" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+  LIBPNG=""
-+
-+fi
-+
-+
-+
+   LIBPNG=""
+ 
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for libjpeg6b" >&5
+-echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
 +echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+void jpeg_CreateDecompress();
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+jpeg_CreateDecompress();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ if test "${ac_cv_lib_jpeg_6b+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29599,35 +29964,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -46193,74 +33011,71 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_jpeg_6b=no"
 +	eval "ac_cv_lib_jpeg_6b=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS="$ac_save_LIBS"
-+CFLAGS="$ac_save_CFLAGS"
-+
-+fi
-+
-+
-+if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
-+  LIBJPEG="$ac_cv_lib_jpeg_6b"
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29637,14 +29999,14 @@
+ 
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
+   LIBJPEG="$ac_cv_lib_jpeg_6b"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
+-echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
 +echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking for libjpeg" >&5
+-echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for libjpeg" >&5
 +echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+void jpeg_CreateDecompress();
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+jpeg_CreateDecompress();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ if test "${ac_cv_lib_jpeg_normal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29677,35 +30039,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -46268,1022 +33083,442 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "ac_cv_lib_jpeg_normal=-ljpeg"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_jpeg_normal=no"
 +	eval "ac_cv_lib_jpeg_normal=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS="$ac_save_LIBS"
-+CFLAGS="$ac_save_CFLAGS"
-+
-+fi
-+
-+
-+if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
-+  LIBJPEG="$ac_cv_lib_jpeg_normal"
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29715,11 +30074,11 @@
+ 
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
+   LIBJPEG="$ac_cv_lib_jpeg_normal"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
+-echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
 +echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+
-+       LIBJPEG=
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+
-+
-+jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-+
-+jpeg_incdir=NO
-+for i in $jpeg_incdirs;
-+do
-+  for j in jpeglib.h;
-+  do
+ 
+        LIBJPEG=
+ 
+@@ -29739,7 +30098,7 @@
+ do
+   for j in jpeglib.h;
+   do
+-    echo "configure: 29742: $i/$j" >&5
 +    echo "configure: 30101: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      jpeg_incdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+test "x$jpeg_incdir" = xNO && jpeg_incdir=
-+
-+if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBJPEG 1
-+_ACEOF
-+
-+else
-+  if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-+    { echo "$as_me:$LINENO: WARNING:
-+There is an installation error in jpeg support. You seem to have only one
-+of either the headers _or_ the libraries installed. You may need to either
-+provide correct --with-extra-... options, or the development package of
-+libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-+Disabling JPEG support.
-+" >&5
-+echo "$as_me: WARNING:
-+There is an installation error in jpeg support. You seem to have only one
-+of either the headers _or_ the libraries installed. You may need to either
-+provide correct --with-extra-... options, or the development package of
-+libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-+Disabling JPEG support.
-+" >&2;}
-+  else
-+    { echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
-+echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
-+  fi
-+  jpeg_incdir=
-+  LIBJPEG=
-+fi
-+
-+
-+
-+
-+
-+
-+
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       jpeg_incdir=$i
+@@ -29786,14 +30145,14 @@
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for perl" >&5
+-echo $ECHO_N "checking for perl... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for perl" >&5
 +echo $ECHO_N "checking for perl... $ECHO_C" >&6; }
-+   if test -n "$PERL"; then
-+        kde_cv_path="$PERL";
-+   else
-+        kde_cache=`echo perl | sed 'y%./+-%__p_%'`
-+
+    if test -n "$PERL"; then
+         kde_cv_path="$PERL";
+    else
+         kde_cache=`echo perl | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="$bindir $exec_prefix/bin $prefix/bin $dirs"
-+        else  	  dirs="$dirs $bindir $exec_prefix/bin $prefix/bin"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/perl"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/perl  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/perl"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/perl"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -29836,8 +30195,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
-+We need perl to generate some code." >&5
-+echo "$as_me: error: No Perl found in your $PATH.
-+We need perl to generate some code." >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+   else
+ 
+ 		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
+ We need perl to generate some code." >&5
+@@ -29846,8 +30205,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      PERL=$kde_cv_path
-+
-+   fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+       PERL=$kde_cv_path
+ 
+    fi
+@@ -29861,10 +30220,9 @@
+ 
+ 
+ 
+-# Check whether --enable-mt or --disable-mt was given.
 +# Check whether --enable-mt was given.
-+if test "${enable_mt+set}" = set; then
+ if test "${enable_mt+set}" = set; then
+-  enableval="$enable_mt"
+-  kde_use_qt_mt=$enableval
 +  enableval=$enable_mt; kde_use_qt_mt=$enableval
-+else
-+
-+    if test $kde_qtver = 3; then
-+      kde_use_qt_mt=yes
-+    else
-+      kde_use_qt_mt=no
-+    fi
-+
-+
+ else
+ 
+     if test $kde_qtver = 3; then
+@@ -29874,7 +30232,8 @@
+     fi
+ 
+ 
+-fi;
 +fi
 +
-+
-+USING_QT_MT=""
-+
-+
-+KDE_MT_LDFLAGS=
-+KDE_MT_LIBS=
-+if test "x$kde_use_qt_mt" = "xyes"; then
-+
-+
-+
-+    if test -z "$LIBPTHREAD"; then
-+    if test -z "$USE_THREADS"; then
-+      kde_check_threading_default=no
-+    else
-+      kde_check_threading_default=yes
-+    fi
-+  else
-+    kde_check_threading_default=yes
-+  fi
+ 
+ USING_QT_MT=""
+ 
+@@ -29894,13 +30253,13 @@
+   else
+     kde_check_threading_default=yes
+   fi
+-  # Check whether --enable-threading or --disable-threading was given.
 +  # Check whether --enable-threading was given.
-+if test "${enable_threading+set}" = set; then
+ if test "${enable_threading+set}" = set; then
+-  enableval="$enable_threading"
+-  kde_use_threading=$enableval
 +  enableval=$enable_threading; kde_use_threading=$enableval
-+else
-+  kde_use_threading=$kde_check_threading_default
+ else
+   kde_use_threading=$kde_check_threading_default
+-fi;
 +fi
 +
-+  if test "x$kde_use_threading" = "xyes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBPTHREAD 1
-+_ACEOF
-+
-+  fi
-+
-+  if test "x$kde_use_threading" = "xyes"; then
-+    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
-+    KDE_MT_LDFLAGS="$USE_THREADS"
-+    KDE_MT_LIBS="$LIBPTHREAD"
-+  else
-+    kde_use_qt_mt=no
-+  fi
-+fi
-+
-+
-+
-+kde_qt_was_given=yes
-+
-+if test -z "$LIBQT_GLOB"; then
-+  if test "x$kde_use_qt_emb" = "xyes"; then
-+    LIBQT_GLOB="libqte.*"
-+  else
-+    LIBQT_GLOB="libqt.*"
-+  fi
-+fi
-+
-+if test "x$kde_use_qt_emb" = "xyes"; then
-+  qtlib="qte"
-+else
-+  qtlib="qt"
-+fi
-+
-+kde_int_qt="-l$qtlib"
-+
-+if test -z "$LIBQPE"; then
-+  if test "x$kde_use_qt_emb" = "xyes"; then
-+    if test "x$kde_use_qt_emb_palm" = "xyes"; then
-+      LIB_QPE="-lqpe"
-+    else
-+      LIB_QPE=""
-+    fi
-+  else
-+    LIB_QPE=""
-+  fi
-+fi
-+
-+
-+if test "x$kde_use_qt_mt" = "xyes"; then
-+  LIBQT="-l$qtlib-mt"
-+  kde_int_qt="-l$qtlib-mt"
-+  LIBQT_GLOB="lib$qtlib-mt.*"
-+  USING_QT_MT="using -mt"
-+else
-+  LIBQT="-l$qtlib"
-+fi
-+
-+if test $kde_qtver != 1; then
-+
-+
-+
-+  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-+fi
-+
-+if test $kde_qtver = 3; then
-+
-+  LIBQT="$LIBQT $LIBDL"
-+fi
-+
+   if test "x$kde_use_threading" = "xyes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -29972,8 +30331,8 @@
+   LIBQT="$LIBQT $LIBDL"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for Qt" >&5
+-echo $ECHO_N "checking for Qt... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for Qt" >&5
 +echo $ECHO_N "checking for Qt... $ECHO_C" >&6; }
-+
-+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"
-+fi
-+ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-+qt_libraries=""
-+qt_includes=""
-+
+ 
+ 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"
+@@ -29982,34 +30341,34 @@
+ qt_libraries=""
+ qt_includes=""
+ 
+-# Check whether --with-qt-dir or --without-qt-dir was given.
 +# Check whether --with-qt-dir was given.
-+if test "${with_qt_dir+set}" = set; then
+ if test "${with_qt_dir+set}" = set; then
+-  withval="$with_qt_dir"
+-    ac_qt_includes="$withval"/include
 +  withval=$with_qt_dir;   ac_qt_includes="$withval"/include
-+       ac_qt_libraries="$withval"/lib${kdelibsuff}
-+       ac_qt_bindir="$withval"/bin
-+
+        ac_qt_libraries="$withval"/lib${kdelibsuff}
+        ac_qt_bindir="$withval"/bin
+ 
+-fi;
 +fi
-+
-+
-+
+ 
+ 
+-# Check whether --with-qt-includes or --without-qt-includes was given.
+-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"
-+
+        ac_qt_includes="$withval"
+ 
+-fi;
 +fi
 +
-+
-+kde_qt_libs_given=no
-+
-+
+ 
+ kde_qt_libs_given=no
+ 
+ 
+-# Check whether --with-qt-libraries or --without-qt-libraries was given.
 +# Check whether --with-qt-libraries was given.
-+if test "${with_qt_libraries+set}" = set; then
+ if test "${with_qt_libraries+set}" = set; then
+-  withval="$with_qt_libraries"
+-    ac_qt_libraries="$withval"
 +  withval=$with_qt_libraries;   ac_qt_libraries="$withval"
-+       kde_qt_libs_given=yes
-+
+        kde_qt_libs_given=yes
+ 
+-fi;
 +fi
 +
-+
-+if test "${ac_cv_have_qt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  #try to guess Qt locations
-+
-+qt_incdirs=""
-+for dir in $kde_qt_dirs; do
-+   qt_incdirs="$qt_incdirs $dir/include $dir"
-+done
-+qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
-+if test ! "$ac_qt_includes" = "NO"; then
-+   qt_incdirs="$ac_qt_includes $qt_incdirs"
-+fi
-+
-+if test "$kde_qtver" != "1"; then
-+  kde_qt_header=qstyle.h
-+else
-+  kde_qt_header=qglobal.h
-+fi
-+
-+
-+qt_incdir=NO
-+for i in $qt_incdirs;
-+do
-+  for j in $kde_qt_header;
-+  do
+ 
+ if test "${ac_cv_have_qt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -30037,7 +30396,7 @@
+ do
+   for j in $kde_qt_header;
+   do
+-    echo "configure: 30040: $i/$j" >&5
 +    echo "configure: 30399: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      qt_incdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+ac_qt_includes="$qt_incdir"
-+
-+qt_libdirs=""
-+for dir in $kde_qt_dirs; do
-+   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
-+done
-+qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
-+if test ! "$ac_qt_libraries" = "NO"; then
-+  qt_libdir=$ac_qt_libraries
-+else
-+  qt_libdirs="$ac_qt_libraries $qt_libdirs"
-+  # if the Qt was given, the chance is too big that libqt.* doesn't exist
-+  qt_libdir=NONE
-+  for dir in $qt_libdirs; do
-+    try="ls -1 $dir/${LIBQT_GLOB}"
-+    if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
-+  done
-+fi
-+for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-+  if test -e "$a"; then
-+    LIBQT="$LIBQT ${kde_int_qt}_incremental"
-+    break
-+  fi
-+done
-+
-+ac_qt_libraries="$qt_libdir"
-+
-+
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       qt_incdir=$i
+@@ -30074,8 +30433,7 @@
+ ac_qt_libraries="$qt_libdir"
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+
-+ac_cxxflags_safe="$CXXFLAGS"
-+ac_ldflags_safe="$LDFLAGS"
-+ac_libs_safe="$LIBS"
-+
-+CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-+LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-+LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
-+
-+
-+
-+cat > conftest.$ac_ext <<EOF
-+#include "confdefs.h"
-+#include <qglobal.h>
-+#include <qapplication.h>
-+EOF
-+if test "$kde_qtver" = "2"; then
-+cat >> conftest.$ac_ext <<EOF
-+#include <qevent.h>
-+#include <qstring.h>
-+#include <qstyle.h>
-+EOF
-+
-+if test $kde_qtsubver -gt 0; then
-+cat >> conftest.$ac_ext <<EOF
-+#if QT_VERSION < 210
-+#error 1
-+#endif
-+EOF
-+fi
-+fi
-+
-+if test "$kde_qtver" = "3"; then
-+cat >> conftest.$ac_ext <<EOF
-+#include <qcursor.h>
-+#include <qstylefactory.h>
-+#include <private/qucomextra_p.h>
-+EOF
-+fi
-+
-+echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-+cat >> conftest.$ac_ext <<EOF
-+#error 1
-+#endif
-+
-+int main() {
-+EOF
-+if test "$kde_qtver" = "2"; then
-+cat >> conftest.$ac_ext <<EOF
-+    QStringList *t = new QStringList();
-+    Q_UNUSED(t);
-+EOF
-+if test $kde_qtsubver -gt 0; then
-+cat >> conftest.$ac_ext <<EOF
-+    QString s;
-+    s.setLatin1("Elvis is alive", 14);
-+EOF
-+fi
-+fi
-+if test "$kde_qtver" = "3"; then
-+cat >> conftest.$ac_ext <<EOF
-+    (void)QStyleFactory::create(QString::null);
-+    QCursor c(Qt::WhatsThisCursor);
-+EOF
-+fi
-+cat >> conftest.$ac_ext <<EOF
-+    return 0;
-+}
-+EOF
-+
-+
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && test -s conftest; then
-+  rm -f conftest*
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  ac_qt_libraries="NO"
-+fi
-+rm -f conftest*
-+CXXFLAGS="$ac_cxxflags_safe"
-+LDFLAGS="$ac_ldflags_safe"
-+LIBS="$ac_libs_safe"
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
-+  ac_cv_have_qt="have_qt=no"
-+  ac_qt_notfound=""
-+  missing_qt_mt=""
-+  if test "$ac_qt_includes" = NO; then
-+    if test "$ac_qt_libraries" = NO; then
-+      ac_qt_notfound="(headers and libraries)";
-+    else
-+      ac_qt_notfound="(headers)";
-+    fi
-+  else
-+    if test "x$kde_use_qt_mt" = "xyes"; then
-+       missing_qt_mt="
-+Make sure that you have compiled Qt with thread support!"
-+       ac_qt_notfound="(library $qtlib-mt)";
-+    else
-+       ac_qt_notfound="(library $qtlib)";
-+    fi
-+  fi
-+
-+  { { echo "$as_me:$LINENO: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-+For more details about this problem, look at the end of config.log.$missing_qt_mt" >&5
-+echo "$as_me: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-+For more details about this problem, look at the end of config.log.$missing_qt_mt" >&2;}
-+   { (exit 1); exit 1; }; }
-+else
-+  have_qt="yes"
-+fi
-+
-+fi
-+
-+
-+eval "$ac_cv_have_qt"
-+
-+if test "$have_qt" != yes; then
+ 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'
+@@ -30212,13 +30570,13 @@
+ eval "$ac_cv_have_qt"
+ 
+ if test "$have_qt" != yes; then
+-  echo "$as_me:$LINENO: result: $have_qt" >&5
+-echo "${ECHO_T}$have_qt" >&6;
 +  { echo "$as_me:$LINENO: result: $have_qt" >&5
 +echo "${ECHO_T}$have_qt" >&6; };
-+else
-+  ac_cv_have_qt="have_qt=yes \
-+    ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
+ else
+   ac_cv_have_qt="have_qt=yes \
+     ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
+-  echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
+-echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6
 +  { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
 +echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
-+
-+  qt_libraries="$ac_qt_libraries"
-+  qt_includes="$ac_qt_includes"
-+fi
-+
-+if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
-+
-+
+ 
+   qt_libraries="$ac_qt_libraries"
+   qt_includes="$ac_qt_includes"
+@@ -30227,15 +30585,14 @@
+ if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
+ 
+ 
+-echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
+-echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
 +echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; }
-+if test "${kde_cv_qt_direct+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_qt_direct+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-+ac_LIBRARY_PATH="$LIBRARY_PATH"
-+ac_cxxflags_safe="$CXXFLAGS"
-+ac_ldflags_safe="$LDFLAGS"
-+ac_libs_safe="$LIBS"
-+
-+CXXFLAGS="$CXXFLAGS -I$qt_includes"
-+LDFLAGS="$LDFLAGS $X_LDFLAGS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-+else
-+LIBS="$LIBQT $LIBSOCKET"
-+fi
-+LD_LIBRARY_PATH=
-+export LD_LIBRARY_PATH
-+LIBRARY_PATH=
-+export LIBRARY_PATH
-+
-+
-+
-+cat > conftest.$ac_ext <<EOF
-+#include "confdefs.h"
-+#include <qglobal.h>
-+#include <qapplication.h>
-+EOF
-+if test "$kde_qtver" = "2"; then
-+cat >> conftest.$ac_ext <<EOF
-+#include <qevent.h>
-+#include <qstring.h>
-+#include <qstyle.h>
-+EOF
-+
-+if test $kde_qtsubver -gt 0; then
-+cat >> conftest.$ac_ext <<EOF
-+#if QT_VERSION < 210
-+#error 1
-+#endif
-+EOF
-+fi
-+fi
-+
-+if test "$kde_qtver" = "3"; then
-+cat >> conftest.$ac_ext <<EOF
-+#include <qcursor.h>
-+#include <qstylefactory.h>
-+#include <private/qucomextra_p.h>
-+EOF
-+fi
-+
-+echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-+cat >> conftest.$ac_ext <<EOF
-+#error 1
-+#endif
-+
-+int main() {
-+EOF
-+if test "$kde_qtver" = "2"; then
-+cat >> conftest.$ac_ext <<EOF
-+    QStringList *t = new QStringList();
-+    Q_UNUSED(t);
-+EOF
-+if test $kde_qtsubver -gt 0; then
-+cat >> conftest.$ac_ext <<EOF
-+    QString s;
-+    s.setLatin1("Elvis is alive", 14);
-+EOF
-+fi
-+fi
-+if test "$kde_qtver" = "3"; then
-+cat >> conftest.$ac_ext <<EOF
-+    (void)QStyleFactory::create(QString::null);
-+    QCursor c(Qt::WhatsThisCursor);
-+EOF
-+fi
-+cat >> conftest.$ac_ext <<EOF
-+    return 0;
-+}
-+EOF
-+
-+
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && test -s conftest; then
-+  kde_cv_qt_direct="yes"
-+else
-+  kde_cv_qt_direct="no"
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+
-+rm -f conftest*
-+CXXFLAGS="$ac_cxxflags_safe"
-+LDFLAGS="$ac_ldflags_safe"
-+LIBS="$ac_libs_safe"
-+
-+LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-+export LD_LIBRARY_PATH
-+LIBRARY_PATH="$ac_LIBRARY_PATH"
-+export LIBRARY_PATH
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
-+if test "$kde_cv_qt_direct" = "yes"; then
+ 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'
+@@ -30356,12 +30713,12 @@
+ 
+ 
+ if test "$kde_cv_qt_direct" = "yes"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+  qt_libraries=
-+else
+   qt_libraries=
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+
-+fi
-+
-+fi
-+
-+
-+
-+
-+if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
-+ QT_INCLUDES=""
-+else
-+ QT_INCLUDES="-I$qt_includes"
-+ all_includes="$QT_INCLUDES $all_includes"
-+fi
-+
-+if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
-+ QT_LDFLAGS=""
-+else
-+ QT_LDFLAGS="-L$qt_libraries"
-+ all_libraries="$QT_LDFLAGS $all_libraries"
-+fi
-+test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-+
-+
-+
-+
-+
-+   qt_bindirs=""
-+   for dir in $kde_qt_dirs; do
-+      qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
-+   done
-+   qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
-+   if test ! "$ac_qt_bindir" = "NO"; then
-+      qt_bindirs="$ac_qt_bindir $qt_bindirs"
-+   fi
-+
-+
+ 
+ fi
+ 
+@@ -30399,14 +30756,14 @@
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for moc" >&5
+-echo $ECHO_N "checking for moc... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for moc" >&5
 +echo $ECHO_N "checking for moc... $ECHO_C" >&6; }
-+   if test -n "$MOC"; then
-+        kde_cv_path="$MOC";
-+   else
-+        kde_cache=`echo moc | sed 'y%./+-%__p_%'`
-+
+    if test -n "$MOC"; then
+         kde_cv_path="$MOC";
+    else
+         kde_cache=`echo moc | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="$qt_bindirs $dirs"
-+        else  	  dirs="$dirs $qt_bindirs"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/moc"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/moc  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/moc"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/moc"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30449,8 +30806,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+    { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
-+Please check whether you installed Qt correctly.
-+You need to have a running moc binary.
-+configure tried to run $ac_cv_path_moc and the test didn't
-+succeed. If configure shouldn't have tried this one, set
-+the environment variable MOC to the right one before running
-+configure.
-+" >&5
-+echo "$as_me: error: No Qt meta object compiler (moc) found!
-+Please check whether you installed Qt correctly.
-+You need to have a running moc binary.
-+configure tried to run $ac_cv_path_moc and the test didn't
-+succeed. If configure shouldn't have tried this one, set
-+the environment variable MOC to the right one before running
-+configure.
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+   else
+ 
+     { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
+ Please check whether you installed Qt correctly.
+@@ -30471,22 +30828,22 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      MOC=$kde_cv_path
-+
-+   fi
-+
-+   if test -z "$UIC_NOT_NEEDED"; then
-+
+       MOC=$kde_cv_path
+ 
+    fi
+ 
+    if test -z "$UIC_NOT_NEEDED"; then
+ 
+-   echo "$as_me:$LINENO: checking for uic" >&5
+-echo $ECHO_N "checking for uic... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for uic" >&5
 +echo $ECHO_N "checking for uic... $ECHO_C" >&6; }
-+   if test -n "$UIC_PATH"; then
-+        kde_cv_path="$UIC_PATH";
-+   else
-+        kde_cache=`echo uic | sed 'y%./+-%__p_%'`
-+
+    if test -n "$UIC_PATH"; then
+         kde_cv_path="$UIC_PATH";
+    else
+         kde_cache=`echo uic | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="$qt_bindirs $dirs"
-+        else  	  dirs="$dirs $qt_bindirs"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/uic"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/uic  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/uic"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/uic"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30529,12 +30886,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+      UIC_PATH=""
-+   else
+       UIC_PATH=""
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      UIC_PATH=$kde_cv_path
-+
-+   fi
-+
-+     if test -z "$UIC_PATH" ; then
-+
-+    { echo "$as_me:$LINENO: WARNING: No Qt ui compiler (uic) found!
-+Please check whether you installed Qt correctly.
-+You need to have a running uic binary.
-+configure tried to run $ac_cv_path_uic and the test didn't
-+succeed. If configure shouldn't have tried this one, set
-+the environment variable UIC to the right one before running
-+configure.
-+" >&5
-+echo "$as_me: WARNING: No Qt ui compiler (uic) found!
-+Please check whether you installed Qt correctly.
-+You need to have a running uic binary.
-+configure tried to run $ac_cv_path_uic and the test didn't
-+succeed. If configure shouldn't have tried this one, set
-+the environment variable UIC to the right one before running
-+configure.
-+" >&2;}
-+
-+       exit 1
-+     else
-+       UIC=$UIC_PATH
-+
-+       if test $kde_qtver = 3; then
-+
+       UIC_PATH=$kde_cv_path
+ 
+    fi
+@@ -30564,10 +30921,10 @@
+ 
+        if test $kde_qtver = 3; then
+ 
+-    echo "$as_me:$LINENO: checking whether uic supports -L " >&5
+-echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking whether uic supports -L " >&5
 +echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; }
-+    kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
+     kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
+-    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
 +    if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        cat >conftest.ui <<EOT
-+        <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-+EOT
-+        ac_uic_testrun="$UIC_PATH -L /nonexistent conftest.ui >/dev/null"
-+        if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
-+  (eval $ac_uic_testrun) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+            eval "kde_cv_prog_uic_$kde_cache=yes"
-+        else
-+            eval "kde_cv_prog_uic_$kde_cache=no"
-+        fi
-+        rm -f conftest*
-+
-+fi
-+
-+
-+    if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30590,22 +30947,22 @@
+ 
+ 
+     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +        { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+        :
-+        ac_uic_supports_libpath=yes
-+    else
+         :
+         ac_uic_supports_libpath=yes
+     else
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +        { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+        :
-+        ac_uic_supports_libpath=no
-+    fi
-+
-+
+         :
+         ac_uic_supports_libpath=no
+     fi
+ 
+ 
+-    echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
+-echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
 +echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; }
-+    kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
+     kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
+-    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
 +    if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        cat >conftest.ui <<EOT
-+        <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-+EOT
-+        ac_uic_testrun="$UIC_PATH -nounload  conftest.ui >/dev/null"
-+        if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
-+  (eval $ac_uic_testrun) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+            eval "kde_cv_prog_uic_$kde_cache=yes"
-+        else
-+            eval "kde_cv_prog_uic_$kde_cache=no"
-+        fi
-+        rm -f conftest*
-+
-+fi
-+
-+
-+    if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30628,13 +30985,13 @@
+ 
+ 
+     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +        { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+        :
-+        ac_uic_supports_nounload=yes
-+    else
+         :
+         ac_uic_supports_nounload=yes
+     else
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +        { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+        :
-+        ac_uic_supports_nounload=no
-+    fi
-+
-+
-+         if test x$ac_uic_supports_libpath = xyes; then
-+             UIC="$UIC -L \$(kde_widgetdir)"
-+         fi
-+         if test x$ac_uic_supports_nounload = xyes; then
-+             UIC="$UIC -nounload"
-+         fi
-+       fi
-+     fi
-+   else
-+     UIC="echo uic not available: "
-+   fi
-+
-+
-+
-+
-+   UIC_TR="i18n"
-+   if test $kde_qtver = 3; then
-+     UIC_TR="tr2i18n"
-+   fi
-+
-+
-+
-+
-+
-+if test -n "$LIBJPEG"; then
+         :
+         ac_uic_supports_nounload=no
+     fi
+@@ -30665,15 +31022,14 @@
+ 
+ 
+ if test -n "$LIBJPEG"; then
+-echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
+-echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
 +echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; }
-+if test "${kde_cv_qt_jpeg+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_qt_jpeg+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
-+LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
-+ac_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <qapplication.h>
-+int
-+main ()
-+{
-+
-+            int argc;
-+            char** argv;
-+            QApplication app(argc, argv);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -30706,35 +31062,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -47291,1982 +33526,757 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
-+
+   eval "kde_cv_qt_jpeg=no"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "kde_cv_qt_jpeg=yes"
 +	eval "kde_cv_qt_jpeg=yes"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS="$ac_save_LIBS"
-+CXXFLAGS="$ac_save_CXXFLAGS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
-+
-+if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -30750,12 +31103,12 @@
+ 
+ 
+ if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+  LIBJPEG_QT='$(LIBJPEG)'
-+else
+   LIBJPEG_QT='$(LIBJPEG)'
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+  LIBJPEG_QT=
-+fi
-+
-+
-+
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
-+else
-+LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
-+fi
-+test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
-+for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-+  if test -e "$a"; then
-+     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
-+     break
-+  fi
-+done
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+   LIBJPEG_QT=
+ fi
+ 
+@@ -30786,15 +31139,15 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for rpath" >&5
+-echo $ECHO_N "checking for rpath... $ECHO_C" >&6
+-# Check whether --enable-rpath or --disable-rpath was given.
 +{ echo "$as_me:$LINENO: checking for rpath" >&5
 +echo $ECHO_N "checking for rpath... $ECHO_C" >&6; }
 +# Check whether --enable-rpath was given.
-+if test "${enable_rpath+set}" = set; then
+ if test "${enable_rpath+set}" = set; then
+-  enableval="$enable_rpath"
+-  USE_RPATH=$enableval
 +  enableval=$enable_rpath; USE_RPATH=$enableval
-+else
-+  USE_RPATH=yes
+ else
+   USE_RPATH=yes
+-fi;
 +fi
 +
-+
-+if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-+
-+  KDE_RPATH="-R \$(libdir)"
-+
-+  if test "$kde_libraries" != "$libdir"; then
-+      KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
-+  fi
-+
-+  if test -n "$qt_libraries"; then
-+    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-+  fi
-+    if test -n "$X_LDFLAGS"; then
-+    X_RPATH="-R \$(x_libraries)"
-+    KDE_RPATH="$KDE_RPATH $X_RPATH"
-+  fi
-+  if test -n "$KDE_EXTRA_RPATH"; then
-+    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
-+  fi
-+fi
-+
-+
-+
+ 
+ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
+ 
+@@ -30818,11 +31171,11 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: result: $USE_RPATH" >&5
+-echo "${ECHO_T}$USE_RPATH" >&6
 +{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5
 +echo "${ECHO_T}$USE_RPATH" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking for KDE" >&5
+-echo $ECHO_N "checking for KDE... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for KDE" >&5
 +echo $ECHO_N "checking for KDE... $ECHO_C" >&6; }
-+
-+if test "${prefix}" != NONE; then
-+  kde_includes=${includedir}
-+
-+savex=$exec_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+tmp=$includedir
-+while ac_kde_includes=`eval echo "$tmp"`; test "x$ac_kde_includes" != "x$tmp"; do tmp=$ac_kde_includes; done
-+exec_prefix=$savex
-+
-+
-+  kde_libraries=${libdir}
-+
-+savex=$exec_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+tmp=$libdir
-+while ac_kde_libraries=`eval echo "$tmp"`; test "x$ac_kde_libraries" != "x$tmp"; do tmp=$ac_kde_libraries; done
-+exec_prefix=$savex
-+
-+
-+else
-+  ac_kde_includes=
-+  ac_kde_libraries=
-+  kde_libraries=""
-+  kde_includes=""
-+fi
-+
-+if test "${ac_cv_have_kde+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  #try to guess kde locations
-+
-+if test "$kde_qtver" = 1; then
-+  kde_check_header="ksock.h"
-+  kde_check_lib="libkdecore.la"
-+else
-+  kde_check_header="ksharedptr.h"
-+  kde_check_lib="libkio.la"
-+fi
-+
-+if test -z ""; then
-+
-+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-+test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
-+kde_incdirs="$ac_kde_includes $kde_incdirs"
-+
-+kde_incdir=NO
-+for i in $kde_incdirs;
-+do
-+  for j in $kde_check_header;
-+  do
+ 
+ if test "${prefix}" != NONE; then
+   kde_includes=${includedir}
+@@ -30874,7 +31227,7 @@
+ do
+   for j in $kde_check_header;
+   do
+-    echo "configure: 30877: $i/$j" >&5
 +    echo "configure: 31230: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      kde_incdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+ac_kde_includes="$kde_incdir"
-+
-+if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
-+  { { echo "$as_me:$LINENO: error:
-+in the prefix, you've chosen, are no KDE headers installed. This will fail.
-+So, check this please and use another prefix!" >&5
-+echo "$as_me: error:
-+in the prefix, you've chosen, are no KDE headers installed. This will fail.
-+So, check this please and use another prefix!" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-+test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
-+kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
-+
-+kde_libdir=NO
-+for i in $kde_libdirs;
-+do
-+  for j in $kde_check_lib;
-+  do
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_incdir=$i
+@@ -30904,7 +31257,7 @@
+ do
+   for j in $kde_check_lib;
+   do
+-    echo "configure: 30907: $i/$j" >&5
 +    echo "configure: 31260: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      kde_libdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+ac_kde_libraries="$kde_libdir"
-+
-+kde_widgetdir=NO
-+
-+kde_widgetdir=NO
-+for i in $kde_libdirs;
-+do
-+  for j in "kde3/plugins/designer/kdewidgets.la";
-+  do
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_libdir=$i
+@@ -30922,7 +31275,7 @@
+ do
+   for j in "kde3/plugins/designer/kdewidgets.la";
+   do
+-    echo "configure: 30925: $i/$j" >&5
 +    echo "configure: 31278: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      kde_widgetdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+
-+if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-+{ { echo "$as_me:$LINENO: error:
-+in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-+So, check this please and use another prefix!" >&5
-+echo "$as_me: error:
-+in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-+So, check this please and use another prefix!" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-+{ { echo "$as_me:$LINENO: error:
-+I can't find the designer plugins. These are required and should have been installed
-+by kdelibs" >&5
-+echo "$as_me: error:
-+I can't find the designer plugins. These are required and should have been installed
-+by kdelibs" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+if test -n "$kde_widgetdir"; then
-+    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
-+fi
-+
-+
-+if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then
-+  ac_cv_have_kde="have_kde=no"
-+else
-+  ac_cv_have_kde="have_kde=yes \
-+    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-+fi
-+
-+else
-+  ac_cv_have_kde="have_kde=no"
-+
-+fi
-+
-+fi
-+
-+eval "$ac_cv_have_kde"
-+
-+if test "$have_kde" != "yes"; then
-+ if test "${prefix}" = NONE; then
-+  ac_kde_prefix="$ac_default_prefix"
-+ else
-+  ac_kde_prefix="$prefix"
-+ fi
-+ if test "$exec_prefix" = NONE; then
-+  ac_kde_exec_prefix="$ac_kde_prefix"
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_widgetdir=$i
+@@ -30981,12 +31334,12 @@
+  fi
+  if test "$exec_prefix" = NONE; then
+   ac_kde_exec_prefix="$ac_kde_prefix"
+-  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
+-echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6
 +  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
 +echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; }
-+ else
-+  ac_kde_exec_prefix="$exec_prefix"
+  else
+   ac_kde_exec_prefix="$exec_prefix"
+-  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
+-echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6
 +  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
 +echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
-+ fi
-+
-+ kde_libraries="${libdir}"
-+ kde_includes="${includedir}"
-+
-+else
-+  ac_cv_have_kde="have_kde=yes \
-+    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
+  fi
+ 
+  kde_libraries="${libdir}"
+@@ -30995,8 +31348,8 @@
+ else
+   ac_cv_have_kde="have_kde=yes \
+     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
+-  echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
+-echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6
 +  { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
 +echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
-+
-+  kde_libraries="$ac_kde_libraries"
-+  kde_includes="$ac_kde_includes"
-+fi
-+
-+
-+
-+if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes"  || test "$kde_includes" = "/usr/include"; then
-+ KDE_INCLUDES=""
-+else
-+ KDE_INCLUDES="-I$kde_includes"
-+ all_includes="$KDE_INCLUDES $all_includes"
-+fi
-+
-+KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
-+
-+KDE_LDFLAGS="-L$kde_libraries"
-+if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then
-+ all_libraries="$KDE_LDFLAGS $all_libraries"
-+fi
-+
-+
-+
-+
-+
-+
-+all_libraries="$all_libraries $USER_LDFLAGS"
-+all_includes="$all_includes $USER_INCLUDES"
-+
-+
-+
-+if test -z ""; then
-+
-+
-+
-+if test x$ac_uic_supports_libpath = xyes; then
-+
+ 
+   kde_libraries="$ac_kde_libraries"
+   kde_includes="$ac_kde_includes"
+@@ -31034,8 +31387,8 @@
+ 
+ if test x$ac_uic_supports_libpath = xyes; then
+ 
+-echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
+-echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
 +echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; }
-+if test "${kde_cv_uic_plugins+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cat > actest.ui << EOF
-+<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-+<class>NewConnectionDialog</class>
-+<widget class="QDialog">
-+   <widget class="KLineEdit">
-+        <property name="name">
-+           <cstring>testInput</cstring>
-+        </property>
-+   </widget>
-+</widget>
-+</UI>
-+EOF
-+
-+
-+
-+kde_cv_uic_plugins=no
-+kde_line="$UIC_PATH -L $kde_widgetdir"
-+if test x$ac_uic_supports_nounload = xyes; then
-+   kde_line="$kde_line -nounload"
-+fi
-+kde_line="$kde_line -impl actest.h actest.ui > actest.cpp"
-+if { (eval echo "$as_me:$LINENO: \"$kde_line\"") >&5
-+  (eval $kde_line) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+	# if you're trying to debug this check and think it's incorrect,
-+	# better check your installation. The check _is_ correct - your
-+	# installation is not.
-+	if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then
-+		kde_cv_uic_plugins=yes
-+	fi
-+fi
-+rm -f actest.ui actest.cpp
-+
-+fi
-+
-+
+ if test "${kde_cv_uic_plugins+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -31078,8 +31431,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
+-echo "${ECHO_T}$kde_cv_uic_plugins" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
 +echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
-+if test "$kde_cv_uic_plugins" != yes; then
-+	{ { echo "$as_me:$LINENO: error:
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs.
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
-+_same Qt version_, compiled with the _same compiler_ and the same Qt
-+configuration settings.
-+" >&5
-+echo "$as_me: error:
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs.
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
-+_same Qt version_, compiled with the _same compiler_ and the same Qt
-+configuration settings.
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+fi
-+
-+fi
-+
-+ac_kde_libraries="$kde_libdir"
-+
-+
-+
-+
-+
+ if test "$kde_cv_uic_plugins" != yes; then
+ 	{ { echo "$as_me:$LINENO: error:
+ you need to install kdelibs first.
+@@ -31111,10 +31464,9 @@
+ 
+ 
+ 
+-  # Check whether --enable-path-check or --disable-path-check was given.
 +  # Check whether --enable-path-check was given.
-+if test "${enable_path_check+set}" = set; then
+ if test "${enable_path_check+set}" = set; then
+-  enableval="$enable_path_check"
+-
 +  enableval=$enable_path_check;
-+  if test "$enableval" = "no";
-+    then ac_use_path_checking="default"
-+    else ac_use_path_checking=""
-+  fi
-+
-+else
-+
-+  if test "$kde_qtver" = 1;
-+    then ac_use_path_checking=""
-+    else ac_use_path_checking="default"
-+  fi
-+
-+
+   if test "$enableval" = "no";
+     then ac_use_path_checking="default"
+     else ac_use_path_checking=""
+@@ -31128,13 +31480,14 @@
+   fi
+ 
+ 
+-fi;
 +fi
 +
-+
-+
-+
-+
+ 
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for KDE paths" >&5
+-echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for KDE paths" >&5
 +echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
-+kde_result=""
-+kde_cached_paths=yes
-+if test "${kde_cv_all_paths+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+if test "$ac_use_path_checking" = "default"; then
-+
-+  if test -z "$kde_htmldir"; then
-+    kde_htmldir='\${datadir}/doc/HTML'
-+  fi
-+  if test -z "$kde_appsdir"; then
-+    kde_appsdir='\${datadir}/applnk'
-+  fi
-+  if test -z "$kde_icondir"; then
-+    kde_icondir='\${datadir}/icons'
-+  fi
-+  if test -z "$kde_sounddir"; then
-+    kde_sounddir='\${datadir}/sounds'
-+  fi
-+  if test -z "$kde_datadir"; then
-+    kde_datadir='\${datadir}/apps'
-+  fi
-+  if test -z "$kde_locale"; then
-+    kde_locale='\${datadir}/locale'
-+  fi
-+  if test -z "$kde_cgidir"; then
-+    kde_cgidir='\${exec_prefix}/cgi-bin'
-+  fi
-+  if test -z "$kde_confdir"; then
-+    kde_confdir='\${datadir}/config'
-+  fi
-+  if test -z "$kde_kcfgdir"; then
-+    kde_kcfgdir='\${datadir}/config.kcfg'
-+  fi
-+  if test -z "$kde_mimedir"; then
-+    kde_mimedir='\${datadir}/mimelnk'
-+  fi
-+  if test -z "$kde_toolbardir"; then
-+    kde_toolbardir='\${datadir}/toolbar'
-+  fi
-+  if test -z "$kde_wallpaperdir"; then
-+    kde_wallpaperdir='\${datadir}/wallpapers'
-+  fi
-+  if test -z "$kde_templatesdir"; then
-+    kde_templatesdir='\${datadir}/templates'
-+  fi
-+  if test -z "$kde_bindir"; then
-+    kde_bindir='\${exec_prefix}/bin'
-+  fi
-+  if test -z "$kde_servicesdir"; then
-+    kde_servicesdir='\${datadir}/services'
-+  fi
-+  if test -z "$kde_servicetypesdir"; then
-+    kde_servicetypesdir='\${datadir}/servicetypes'
-+  fi
-+  if test -z "$kde_moduledir"; then
-+    if test "$kde_qtver" = "2"; then
-+      kde_moduledir='\${libdir}/kde2'
-+    else
-+      kde_moduledir='\${libdir}/kde3'
-+    fi
-+  fi
-+  if test -z "$kde_styledir"; then
-+    kde_styledir='\${libdir}/kde3/plugins/styles'
-+  fi
-+  if test -z "$kde_widgetdir"; then
-+    kde_widgetdir='\${libdir}/kde3/plugins/designer'
-+  fi
-+  if test -z "$xdg_appsdir"; then
-+    xdg_appsdir='\${datadir}/applications/kde'
-+  fi
-+  if test -z "$xdg_menudir"; then
-+    xdg_menudir='\${sysconfdir}/xdg/menus'
-+  fi
-+  if test -z "$xdg_directorydir"; then
-+    xdg_directorydir='\${datadir}/desktop-directories'
-+  fi
-+
-+
-+  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-+	kde_htmldir=\"$kde_htmldir\" \
-+	kde_appsdir=\"$kde_appsdir\" \
-+	kde_icondir=\"$kde_icondir\" \
-+	kde_sounddir=\"$kde_sounddir\" \
-+	kde_datadir=\"$kde_datadir\" \
-+	kde_locale=\"$kde_locale\" \
-+	kde_cgidir=\"$kde_cgidir\" \
-+	kde_confdir=\"$kde_confdir\" \
-+	kde_kcfgdir=\"$kde_kcfgdir\" \
-+	kde_mimedir=\"$kde_mimedir\" \
-+	kde_toolbardir=\"$kde_toolbardir\" \
-+	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-+	kde_templatesdir=\"$kde_templatesdir\" \
-+	kde_bindir=\"$kde_bindir\" \
-+	kde_servicesdir=\"$kde_servicesdir\" \
-+	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-+	kde_moduledir=\"$kde_moduledir\" \
-+	kde_styledir=\"$kde_styledir\" \
-+	kde_widgetdir=\"$kde_widgetdir\" \
-+	xdg_appsdir=\"$xdg_appsdir\" \
-+	xdg_menudir=\"$xdg_menudir\" \
-+	xdg_directorydir=\"$xdg_directorydir\" \
-+	kde_result=defaults"
-+
-+
-+else
-+
-+  if test $kde_qtver = 1; then
+ kde_result=""
+ kde_cached_paths=yes
+ if test "${kde_cv_all_paths+set}" = set; then
+@@ -31245,15 +31598,14 @@
+ else
+ 
+   if test $kde_qtver = 1; then
+-     echo "$as_me:$LINENO: result: compiling" >&5
+-echo "${ECHO_T}compiling" >&6
+-
 +     { echo "$as_me:$LINENO: result: compiling" >&5
 +echo "${ECHO_T}compiling" >&6; }
-+
-+
+ 
+-    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+ 
 +    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
 +echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
-+
+ 
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+cat > conftest.$ac_ext <<EOF
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+#include <stdio.h>
-+#include "confdefs.h"
-+#include <kapp.h>
-+
-+int main() {
-+    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-+    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-+    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-+    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-+    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-+    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-+    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-+    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-+    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-+    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-+    printf("kde_wallpaperdir=\\"%s\\"\n",
-+	KApplication::kde_wallpaperdir().data());
-+    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-+    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-+    printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-+    printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-+    printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-+    printf("kde_styledir=\\"/tmp/dummy\\"\n");
-+    printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-+    printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-+    printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-+    printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-+    printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-+    return 0;
-+    }
-+EOF
-+
-+ ac_save_CPPFLAGS=$CPPFLAGS
-+ CPPFLAGS="$all_includes $CPPFLAGS"
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
+ 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'
+@@ -31305,8 +31657,8 @@
+   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
 +   { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ 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.
-+For more details about this problem, look at the end of config.log." >&5
-+echo "$as_me: error: your system is not able to compile a small KDE application!
-+Check, if you installed the KDE header files correctly.
-+For more details about this problem, look at the end of config.log." >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+  CPPFLAGS=$ac_save_CPPFLAGS
-+
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+  KDE_TEST_RPATH=
-+
-+  if test -n "$USE_RPATH"; then
-+
-+     if test -n "$kde_libraries"; then
-+       KDE_TEST_RPATH="-R $kde_libraries"
-+     fi
-+
-+     if test -n "$qt_libraries"; then
-+       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-+     fi
-+
-+     if test -n "$x_libraries"; then
-+       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-+     fi
-+
-+     KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-+  fi
-+
+  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.
+@@ -31345,8 +31697,8 @@
+      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+   fi
+ 
+-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
 +echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
-+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
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && test -s conftest; then
+ 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
+@@ -31354,8 +31706,8 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+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
-+same compiler to compile Qt and kdelibs as you did use now.
-+For more details about this problem, look at the end of config.log." >&5
-+echo "$as_me: error: your system fails at linking a small KDE application!
-+Check, if your compiler is installed correctly and if you have used the
-+same compiler to compile Qt and kdelibs as you did use now.
-+For more details about this problem, look at the end of config.log." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+if eval `KDEDIR= ./conftest 2>&5`; then
-+  kde_result=done
-+else
-+  kde_result=problems
-+fi
-+
-+KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-+kde_have_all_paths=yes
-+
-+
-+  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-+	kde_htmldir=\"$kde_htmldir\" \
-+	kde_appsdir=\"$kde_appsdir\" \
-+	kde_icondir=\"$kde_icondir\" \
-+	kde_sounddir=\"$kde_sounddir\" \
-+	kde_datadir=\"$kde_datadir\" \
-+	kde_locale=\"$kde_locale\" \
-+	kde_cgidir=\"$kde_cgidir\" \
-+	kde_confdir=\"$kde_confdir\" \
-+	kde_kcfgdir=\"$kde_kcfgdir\" \
-+	kde_mimedir=\"$kde_mimedir\" \
-+	kde_toolbardir=\"$kde_toolbardir\" \
-+	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-+	kde_templatesdir=\"$kde_templatesdir\" \
-+	kde_bindir=\"$kde_bindir\" \
-+	kde_servicesdir=\"$kde_servicesdir\" \
-+	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-+	kde_moduledir=\"$kde_moduledir\" \
-+	kde_styledir=\"$kde_styledir\" \
-+	kde_widgetdir=\"$kde_widgetdir\" \
-+	xdg_appsdir=\"$xdg_appsdir\" \
-+	xdg_menudir=\"$xdg_menudir\" \
-+	xdg_directorydir=\"$xdg_directorydir\" \
-+	kde_result=$kde_result"
-+
-+
-+
-+  else
-+     { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
-+echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+
-+fi
-+
-+  kde_cached_paths=no
-+
-+fi
-+
-+eval "$kde_cv_all_paths"
-+ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-+   test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-+   test -z "$kde_datadir" || test -z "$kde_locale"  ||
-+   test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
-+   test -z "$kde_kcfgdir" ||
-+   test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-+   test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-+   test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-+   test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-+   test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-+   test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-+   test "x$kde_have_all_paths" != "xyes"; then
-+     kde_have_all_paths=no
-+  fi
-+
-+if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
-+  # wrong values were cached, may be, we can set better ones
-+  kde_result=
-+  kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
-+  kde_datadir= kde_locale=  kde_cgidir=  kde_confdir= kde_kcfgdir=
-+  kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-+  kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-+  kde_have_all_paths=
-+  kde_styledir=
-+  kde_widgetdir=
-+  xdg_appsdir = xdg_menudir= xdg_directorydir=
-+
-+if test "$ac_use_path_checking" = "default"; then
-+
-+  if test -z "$kde_htmldir"; then
-+    kde_htmldir='\${datadir}/doc/HTML'
-+  fi
-+  if test -z "$kde_appsdir"; then
-+    kde_appsdir='\${datadir}/applnk'
-+  fi
-+  if test -z "$kde_icondir"; then
-+    kde_icondir='\${datadir}/icons'
-+  fi
-+  if test -z "$kde_sounddir"; then
-+    kde_sounddir='\${datadir}/sounds'
-+  fi
-+  if test -z "$kde_datadir"; then
-+    kde_datadir='\${datadir}/apps'
-+  fi
-+  if test -z "$kde_locale"; then
-+    kde_locale='\${datadir}/locale'
-+  fi
-+  if test -z "$kde_cgidir"; then
-+    kde_cgidir='\${exec_prefix}/cgi-bin'
-+  fi
-+  if test -z "$kde_confdir"; then
-+    kde_confdir='\${datadir}/config'
-+  fi
-+  if test -z "$kde_kcfgdir"; then
-+    kde_kcfgdir='\${datadir}/config.kcfg'
-+  fi
-+  if test -z "$kde_mimedir"; then
-+    kde_mimedir='\${datadir}/mimelnk'
-+  fi
-+  if test -z "$kde_toolbardir"; then
-+    kde_toolbardir='\${datadir}/toolbar'
-+  fi
-+  if test -z "$kde_wallpaperdir"; then
-+    kde_wallpaperdir='\${datadir}/wallpapers'
-+  fi
-+  if test -z "$kde_templatesdir"; then
-+    kde_templatesdir='\${datadir}/templates'
-+  fi
-+  if test -z "$kde_bindir"; then
-+    kde_bindir='\${exec_prefix}/bin'
-+  fi
-+  if test -z "$kde_servicesdir"; then
-+    kde_servicesdir='\${datadir}/services'
-+  fi
-+  if test -z "$kde_servicetypesdir"; then
-+    kde_servicetypesdir='\${datadir}/servicetypes'
-+  fi
-+  if test -z "$kde_moduledir"; then
-+    if test "$kde_qtver" = "2"; then
-+      kde_moduledir='\${libdir}/kde2'
-+    else
-+      kde_moduledir='\${libdir}/kde3'
-+    fi
-+  fi
-+  if test -z "$kde_styledir"; then
-+    kde_styledir='\${libdir}/kde3/plugins/styles'
-+  fi
-+  if test -z "$kde_widgetdir"; then
-+    kde_widgetdir='\${libdir}/kde3/plugins/designer'
-+  fi
-+  if test -z "$xdg_appsdir"; then
-+    xdg_appsdir='\${datadir}/applications/kde'
-+  fi
-+  if test -z "$xdg_menudir"; then
-+    xdg_menudir='\${sysconfdir}/xdg/menus'
-+  fi
-+  if test -z "$xdg_directorydir"; then
-+    xdg_directorydir='\${datadir}/desktop-directories'
-+  fi
-+
-+
-+  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-+	kde_htmldir=\"$kde_htmldir\" \
-+	kde_appsdir=\"$kde_appsdir\" \
-+	kde_icondir=\"$kde_icondir\" \
-+	kde_sounddir=\"$kde_sounddir\" \
-+	kde_datadir=\"$kde_datadir\" \
-+	kde_locale=\"$kde_locale\" \
-+	kde_cgidir=\"$kde_cgidir\" \
-+	kde_confdir=\"$kde_confdir\" \
-+	kde_kcfgdir=\"$kde_kcfgdir\" \
-+	kde_mimedir=\"$kde_mimedir\" \
-+	kde_toolbardir=\"$kde_toolbardir\" \
-+	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-+	kde_templatesdir=\"$kde_templatesdir\" \
-+	kde_bindir=\"$kde_bindir\" \
-+	kde_servicesdir=\"$kde_servicesdir\" \
-+	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-+	kde_moduledir=\"$kde_moduledir\" \
-+	kde_styledir=\"$kde_styledir\" \
-+	kde_widgetdir=\"$kde_widgetdir\" \
-+	xdg_appsdir=\"$xdg_appsdir\" \
-+	xdg_menudir=\"$xdg_menudir\" \
-+	xdg_directorydir=\"$xdg_directorydir\" \
-+	kde_result=defaults"
-+
-+
-+else
-+
-+  if test $kde_qtver = 1; then
+ 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
+@@ -31548,15 +31900,14 @@
+ else
+ 
+   if test $kde_qtver = 1; then
+-     echo "$as_me:$LINENO: result: compiling" >&5
+-echo "${ECHO_T}compiling" >&6
 +     { echo "$as_me:$LINENO: result: compiling" >&5
 +echo "${ECHO_T}compiling" >&6; }
-+
-+
+ 
+ 
+-    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
 +echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
-+
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+cat > conftest.$ac_ext <<EOF
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+#include <stdio.h>
-+#include "confdefs.h"
-+#include <kapp.h>
-+
-+int main() {
-+    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-+    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-+    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-+    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-+    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-+    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-+    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-+    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-+    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-+    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-+    printf("kde_wallpaperdir=\\"%s\\"\n",
-+	KApplication::kde_wallpaperdir().data());
-+    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-+    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-+    printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-+    printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-+    printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-+    printf("kde_styledir=\\"/tmp/dummy\\"\n");
-+    printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-+    printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-+    printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-+    printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-+    printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-+    return 0;
-+    }
-+EOF
-+
-+ ac_save_CPPFLAGS=$CPPFLAGS
-+ CPPFLAGS="$all_includes $CPPFLAGS"
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
+ 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'
+@@ -31608,8 +31959,8 @@
+   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
 +   { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ 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.
-+For more details about this problem, look at the end of config.log." >&5
-+echo "$as_me: error: your system is not able to compile a small KDE application!
-+Check, if you installed the KDE header files correctly.
-+For more details about this problem, look at the end of config.log." >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+  CPPFLAGS=$ac_save_CPPFLAGS
-+
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+  KDE_TEST_RPATH=
-+
-+  if test -n "$USE_RPATH"; then
-+
-+     if test -n "$kde_libraries"; then
-+       KDE_TEST_RPATH="-R $kde_libraries"
-+     fi
-+
-+     if test -n "$qt_libraries"; then
-+       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-+     fi
-+
-+     if test -n "$x_libraries"; then
-+       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-+     fi
-+
-+     KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-+  fi
-+
+  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.
+@@ -31648,8 +31999,8 @@
+      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+   fi
+ 
+-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
 +echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
-+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
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && test -s conftest; then
+ 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
+@@ -31657,8 +32008,8 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+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
-+same compiler to compile Qt and kdelibs as you did use now.
-+For more details about this problem, look at the end of config.log." >&5
-+echo "$as_me: error: your system fails at linking a small KDE application!
-+Check, if your compiler is installed correctly and if you have used the
-+same compiler to compile Qt and kdelibs as you did use now.
-+For more details about this problem, look at the end of config.log." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+if eval `KDEDIR= ./conftest 2>&5`; then
-+  kde_result=done
-+else
-+  kde_result=problems
-+fi
-+
-+KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-+kde_have_all_paths=yes
-+
-+
-+  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-+	kde_htmldir=\"$kde_htmldir\" \
-+	kde_appsdir=\"$kde_appsdir\" \
-+	kde_icondir=\"$kde_icondir\" \
-+	kde_sounddir=\"$kde_sounddir\" \
-+	kde_datadir=\"$kde_datadir\" \
-+	kde_locale=\"$kde_locale\" \
-+	kde_cgidir=\"$kde_cgidir\" \
-+	kde_confdir=\"$kde_confdir\" \
-+	kde_kcfgdir=\"$kde_kcfgdir\" \
-+	kde_mimedir=\"$kde_mimedir\" \
-+	kde_toolbardir=\"$kde_toolbardir\" \
-+	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-+	kde_templatesdir=\"$kde_templatesdir\" \
-+	kde_bindir=\"$kde_bindir\" \
-+	kde_servicesdir=\"$kde_servicesdir\" \
-+	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-+	kde_moduledir=\"$kde_moduledir\" \
-+	kde_styledir=\"$kde_styledir\" \
-+	kde_widgetdir=\"$kde_widgetdir\" \
-+	xdg_appsdir=\"$xdg_appsdir\" \
-+	xdg_menudir=\"$xdg_menudir\" \
-+	xdg_directorydir=\"$xdg_directorydir\" \
-+	kde_result=$kde_result"
-+
-+
-+
-+  else
-+     { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
-+echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+
-+fi
-+
-+  eval "$kde_cv_all_paths"
-+   if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-+   test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-+   test -z "$kde_datadir" || test -z "$kde_locale"  ||
-+   test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
-+   test -z "$kde_kcfgdir" ||
-+   test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-+   test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-+   test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-+   test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-+   test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-+   test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-+   test "x$kde_have_all_paths" != "xyes"; then
-+     kde_have_all_paths=no
-+  fi
-+
-+  kde_result="$kde_result (cache overridden)"
-+fi
-+if test "$kde_have_all_paths" = "no"; then
-+  { { echo "$as_me:$LINENO: error: configure could not run a little KDE program to test the environment.
-+Since it had compiled and linked before, it must be a strange problem on your system.
-+Look at config.log for details. If you are not able to fix this, look at
-+http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-+(If you're using an egcs version on Linux, you may update binutils!)
-+" >&5
-+echo "$as_me: error: configure could not run a little KDE program to test the environment.
-+Since it had compiled and linked before, it must be a strange problem on your system.
-+Look at config.log for details. If you are not able to fix this, look at
-+http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-+(If you're using an egcs version on Linux, you may update binutils!)
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+else
-+  rm -f conftest*
+ 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
+@@ -31750,22 +32101,22 @@
+    { (exit 1); exit 1; }; }
+ else
+   rm -f conftest*
+-  echo "$as_me:$LINENO: result: $kde_result" >&5
+-echo "${ECHO_T}$kde_result" >&6
 +  { echo "$as_me:$LINENO: result: $kde_result" >&5
 +echo "${ECHO_T}$kde_result" >&6; }
-+fi
-+
-+bindir=$kde_bindir
-+
-+
-+
+ fi
+ 
+ bindir=$kde_bindir
+ 
+ 
+ 
+-# Check whether --with-arts or --without-arts was given.
 +# Check whether --with-arts was given.
-+if test "${with_arts+set}" = set; then
+ if test "${with_arts+set}" = set; then
+-  withval="$with_arts"
+-  build_arts=$withval
 +  withval=$with_arts; build_arts=$withval
-+else
-+  build_arts=yes
-+
+ else
+   build_arts=yes
+ 
+-fi;
 +fi
 +
-+
-+
-+if test "$build_arts" '!=' "no"; then
-+  include_ARTS_TRUE=
-+  include_ARTS_FALSE='#'
-+else
-+  include_ARTS_TRUE='#'
-+  include_ARTS_FALSE=
-+fi
-+
-+    if test "$build_arts" = "no"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define WITHOUT_ARTS 1
-+_ACEOF
-+
-+    fi
-+
-+
-+    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-+    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-+    if test -n "$KDEDIRS"; then
-+       kde_save_IFS=$IFS
-+       IFS=:
-+       for dir in $KDEDIRS; do
-+            kde_default_bindirs="$dir/bin $kde_default_bindirs "
-+       done
-+       IFS=$kde_save_IFS
-+    fi
-+
-+        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
-+
+ 
+ 
+ if test "$build_arts" '!=' "no"; then
+@@ -31798,14 +32149,14 @@
+ 
+         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
+ 
+-   echo "$as_me:$LINENO: checking for dcopidl" >&5
+-echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for dcopidl" >&5
 +echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; }
-+   if test -n "$DCOPIDL"; then
-+        kde_cv_path="$DCOPIDL";
-+   else
-+        kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
-+
+    if test -n "$DCOPIDL"; then
+         kde_cv_path="$DCOPIDL";
+    else
+         kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="$kde_default_bindirs $dirs"
-+        else  	  dirs="$dirs $kde_default_bindirs"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/dcopidl"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/dcopidl  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/dcopidl"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/dcopidl"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31848,8 +32199,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+    { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
-+Please check whether you installed KDE correctly.
-+" >&5
-+echo "$as_me: error: The important program dcopidl was not found!
-+Please check whether you installed KDE correctly.
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+   else
+ 
+     { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
+ Please check whether you installed KDE correctly.
+@@ -31860,21 +32211,21 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      DCOPIDL=$kde_cv_path
-+
-+   fi
-+
-+
+       DCOPIDL=$kde_cv_path
+ 
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
+-echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
 +echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; }
-+   if test -n "$DCOPIDL2CPP"; then
-+        kde_cv_path="$DCOPIDL2CPP";
-+   else
-+        kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
-+
+    if test -n "$DCOPIDL2CPP"; then
+         kde_cv_path="$DCOPIDL2CPP";
+    else
+         kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="$kde_default_bindirs $dirs"
-+        else  	  dirs="$dirs $kde_default_bindirs"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/dcopidl2cpp"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/dcopidl2cpp  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/dcopidl2cpp"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/dcopidl2cpp"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31917,8 +32268,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+    { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
-+Please check whether you installed KDE correctly.
-+" >&5
-+echo "$as_me: error: The important program dcopidl2cpp was not found!
-+Please check whether you installed KDE correctly.
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+   else
+ 
+     { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
+ Please check whether you installed KDE correctly.
+@@ -31929,22 +32280,22 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      DCOPIDL2CPP=$kde_cv_path
-+
-+   fi
-+
-+        if test "$build_arts" '!=' "no"; then
-+
+       DCOPIDL2CPP=$kde_cv_path
+ 
+    fi
+ 
+         if test "$build_arts" '!=' "no"; then
+ 
+-   echo "$as_me:$LINENO: checking for mcopidl" >&5
+-echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for mcopidl" >&5
 +echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
-+   if test -n "$MCOPIDL"; then
-+        kde_cv_path="$MCOPIDL";
-+   else
-+        kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
-+
+    if test -n "$MCOPIDL"; then
+         kde_cv_path="$MCOPIDL";
+    else
+         kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="$kde_default_bindirs $dirs"
-+        else  	  dirs="$dirs $kde_default_bindirs"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/mcopidl"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/mcopidl  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/mcopidl"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/mcopidl"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31987,8 +32338,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+    { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
-+Please check whether you installed aRts correctly or use
-+--without-arts to compile without aRts support (this will remove functionality).
-+" >&5
-+echo "$as_me: error: The important program mcopidl was not found!
-+Please check whether you installed aRts correctly or use
-+--without-arts to compile without aRts support (this will remove functionality).
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+   else
+ 
+     { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
+ Please check whether you installed aRts correctly or use
+@@ -32001,21 +32352,21 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      MCOPIDL=$kde_cv_path
-+
-+   fi
-+
-+
+       MCOPIDL=$kde_cv_path
+ 
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for artsc-config" >&5
+-echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for artsc-config" >&5
 +echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; }
-+   if test -n "$ARTSCCONFIG"; then
-+        kde_cv_path="$ARTSCCONFIG";
-+   else
-+        kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
-+
+    if test -n "$ARTSCCONFIG"; then
+         kde_cv_path="$ARTSCCONFIG";
+    else
+         kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="$kde_default_bindirs $dirs"
-+        else  	  dirs="$dirs $kde_default_bindirs"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/artsc-config"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/artsc-config  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/artsc-config"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/artsc-config"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32058,8 +32409,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+    { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
-+Please check whether you installed aRts correctly or use
-+--without-arts to compile without aRts support (this will remove functionality).
-+" >&5
-+echo "$as_me: error: The important program artsc-config was not found!
-+Please check whether you installed aRts correctly or use
-+--without-arts to compile without aRts support (this will remove functionality).
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+   else
+ 
+     { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
+ Please check whether you installed aRts correctly or use
+@@ -32072,22 +32423,22 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      ARTSCCONFIG=$kde_cv_path
-+
-+   fi
-+
-+        fi
-+
+       ARTSCCONFIG=$kde_cv_path
+ 
+    fi
+ 
+         fi
+ 
+-   echo "$as_me:$LINENO: checking for meinproc" >&5
+-echo $ECHO_N "checking for meinproc... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for meinproc" >&5
 +echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; }
-+   if test -n "$MEINPROC"; then
-+        kde_cv_path="$MEINPROC";
-+   else
-+        kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
-+
+    if test -n "$MEINPROC"; then
+         kde_cv_path="$MEINPROC";
+    else
+         kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="$kde_default_bindirs $dirs"
-+        else  	  dirs="$dirs $kde_default_bindirs"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/meinproc"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/meinproc  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/meinproc"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/meinproc"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32130,12 +32481,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+   else
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      MEINPROC=$kde_cv_path
-+
-+   fi
-+
-+
-+        kde32ornewer=1
-+        kde33ornewer=1
-+        if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
-+            kde32ornewer=
-+            kde33ornewer=
-+        else
-+            if test "$kde_qtver" = "3"; then
-+              if test "$kde_qtsubver" -le 1; then
-+                kde32ornewer=
-+              fi
-+              if test "$kde_qtsubver" -le 2; then
-+                kde33ornewer=
-+              fi
-+              if test "$KDECONFIG" != "compiled"; then
-+                if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
-+                  kde33ornewer=
-+                fi
-+              fi
-+            fi
-+        fi
-+
-+        if test -n "$kde32ornewer"; then
-+
+       MEINPROC=$kde_cv_path
+ 
+    fi
+@@ -32164,14 +32515,14 @@
+ 
+         if test -n "$kde32ornewer"; then
+ 
+-   echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
+-echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
 +echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; }
-+   if test -n "$KCONFIG_COMPILER"; then
-+        kde_cv_path="$KCONFIG_COMPILER";
-+   else
-+        kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
-+
+    if test -n "$KCONFIG_COMPILER"; then
+         kde_cv_path="$KCONFIG_COMPILER";
+    else
+         kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="$kde_default_bindirs $dirs"
-+        else  	  dirs="$dirs $kde_default_bindirs"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/kconfig_compiler"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/kconfig_compiler  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/kconfig_compiler"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/kconfig_compiler"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32214,8 +32565,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+    { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
-+Please check whether you installed KDE correctly.
-+" >&5
-+echo "$as_me: error: The important program kconfig_compiler was not found!
-+Please check whether you installed KDE correctly.
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+   else
+ 
+     { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
+ Please check whether you installed KDE correctly.
+@@ -32226,21 +32577,21 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      KCONFIG_COMPILER=$kde_cv_path
-+
-+   fi
-+
-+
+       KCONFIG_COMPILER=$kde_cv_path
+ 
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dcopidlng" >&5
+-echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for dcopidlng" >&5
 +echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; }
-+   if test -n "$DCOPIDLNG"; then
-+        kde_cv_path="$DCOPIDLNG";
-+   else
-+        kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
-+
+    if test -n "$DCOPIDLNG"; then
+         kde_cv_path="$DCOPIDLNG";
+    else
+         kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="$kde_default_bindirs $dirs"
-+        else  	  dirs="$dirs $kde_default_bindirs"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/dcopidlng"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/dcopidlng  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/dcopidlng"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/dcopidlng"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32283,8 +32634,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+    { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
-+Please check whether you installed KDE correctly.
-+" >&5
-+echo "$as_me: error: The important program dcopidlng was not found!
-+Please check whether you installed KDE correctly.
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+   else
+ 
+     { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
+ Please check whether you installed KDE correctly.
+@@ -32295,8 +32646,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      DCOPIDLNG=$kde_cv_path
-+
-+   fi
-+
-+        fi
-+        if test -n "$kde33ornewer"; then
-+
+       DCOPIDLNG=$kde_cv_path
+ 
+    fi
+@@ -32304,14 +32655,14 @@
+         fi
+         if test -n "$kde33ornewer"; then
+ 
+-   echo "$as_me:$LINENO: checking for makekdewidgets" >&5
+-echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for makekdewidgets" >&5
 +echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; }
-+   if test -n "$MAKEKDEWIDGETS"; then
-+        kde_cv_path="$MAKEKDEWIDGETS";
-+   else
-+        kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
-+
+    if test -n "$MAKEKDEWIDGETS"; then
+         kde_cv_path="$MAKEKDEWIDGETS";
+    else
+         kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="$kde_default_bindirs $dirs"
-+        else  	  dirs="$dirs $kde_default_bindirs"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/makekdewidgets"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/makekdewidgets  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/makekdewidgets"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/makekdewidgets"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32354,8 +32705,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+    { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
-+Please check whether you installed KDE correctly.
-+" >&5
-+echo "$as_me: error: The important program makekdewidgets was not found!
-+Please check whether you installed KDE correctly.
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+   else
+ 
+     { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
+ Please check whether you installed KDE correctly.
+@@ -32366,8 +32717,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      MAKEKDEWIDGETS=$kde_cv_path
-+
-+   fi
-+
-+
-+        fi
-+
+       MAKEKDEWIDGETS=$kde_cv_path
+ 
+    fi
+@@ -32375,14 +32726,14 @@
+ 
+         fi
+ 
+-   echo "$as_me:$LINENO: checking for xmllint" >&5
+-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for xmllint" >&5
 +echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
-+   if test -n "$XMLLINT"; then
-+        kde_cv_path="$XMLLINT";
-+   else
-+        kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
-+
+    if test -n "$XMLLINT"; then
+         kde_cv_path="$XMLLINT";
+    else
+         kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="${prefix}/bin ${exec_prefix}/bin $dirs"
-+        else  	  dirs="$dirs ${prefix}/bin ${exec_prefix}/bin"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/xmllint"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/xmllint  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/xmllint"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/xmllint"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32425,12 +32776,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+      XMLLINT=""
-+   else
+       XMLLINT=""
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      XMLLINT=$kde_cv_path
-+
-+   fi
-+
-+
-+        if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
-+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-+            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
-+
-+KDE_XSL_STYLESHEET=NO
-+for i in $kde_sharedirs;
-+do
-+  for j in apps/ksgmltools2/customization/kde-chunk.xsl;
-+  do
+       XMLLINT=$kde_cv_path
+ 
+    fi
+@@ -32445,7 +32796,7 @@
+ do
+   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
+   do
+-    echo "configure: 32448: $i/$j" >&5
 +    echo "configure: 32799: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      KDE_XSL_STYLESHEET=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
-+		KDE_XSL_STYLESHEET=""
-+	    else
-+                KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl"
-+	    fi
-+        fi
-+
-+        DCOP_DEPENDENCIES='$(DCOPIDL)'
-+        if test -n "$kde32ornewer"; then
-+            KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
-+            DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
-+
-+
-+
-+        fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+kdeinitdir='$(kde_moduledir)'
-+
-+
-+
-+if test "$kde_qtver" = 1; then
-+  kde_minidir="$kde_icondir/mini"
-+else
-+# for KDE 1 - this breaks KDE2 apps using minidir, but
-+# that's the plan ;-/
-+  kde_minidir="/dev/null"
-+fi
-+
-+
-+
-+
-+
-+
-+if test $kde_qtver = 3; then
-+   case $host in
-+               *cygwin*) lib_kded="-lkdeinit_kded" ;;
-+               *) lib_kded="" ;;
-+       esac
-+   LIB_KDED=$lib_kded
-+
-+   LIB_KDECORE="-lkdecore"
-+
-+   LIB_KDEUI="-lkdeui"
-+
-+   LIB_KIO="-lkio"
-+
-+   LIB_KJS="-lkjs"
-+
-+   LIB_SMB="-lsmb"
-+
-+   LIB_KAB="-lkab"
-+
-+   LIB_KABC="-lkabc"
-+
-+   LIB_KHTML="-lkhtml"
-+
-+   LIB_KSPELL="-lkspell"
-+
-+   LIB_KPARTS="-lkparts"
-+
-+   LIB_KDEPRINT="-lkdeprint"
-+
-+   LIB_KUTILS="-lkutils"
-+
-+   LIB_KDEPIM="-lkdepim"
-+
-+   LIB_KIMPROXY="-lkimproxy"
-+
-+   LIB_KNEWSTUFF="-lknewstuff"
-+
-+   LIB_KDNSSD="-lkdnssd"
-+
-+   LIB_KUNITTEST="-lkunittest"
-+
-+# these are for backward compatibility
-+   LIB_KSYCOCA="-lkio"
-+
-+   LIB_KFILE="-lkio"
-+
-+elif test $kde_qtver = 2; then
-+   LIB_KDECORE="-lkdecore"
-+
-+   LIB_KDEUI="-lkdeui"
-+
-+   LIB_KIO="-lkio"
-+
-+   LIB_KSYCOCA="-lksycoca"
-+
-+   LIB_SMB="-lsmb"
-+
-+   LIB_KFILE="-lkfile"
-+
-+   LIB_KAB="-lkab"
-+
-+   LIB_KHTML="-lkhtml"
-+
-+   LIB_KSPELL="-lkspell"
-+
-+   LIB_KPARTS="-lkparts"
-+
-+   LIB_KDEPRINT="-lkdeprint"
-+
-+else
-+   LIB_KDECORE="-lkdecore -lXext $(LIB_QT)"
-+
-+   LIB_KDEUI="-lkdeui $(LIB_KDECORE)"
-+
-+   LIB_KFM="-lkfm $(LIB_KDECORE)"
-+
-+   LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)"
-+
-+   LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)"
-+
-+fi
-+
-+
-+
-+#MIN_CONFIG
-+
-+
-+
-+
-+
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       KDE_XSL_STYLESHEET=$i
+@@ -32607,13 +32958,12 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
+-echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
 +echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6; }
-+
-+  if test "x$GXX" = "xyes"; then
-+
+ 
+   if test "x$GXX" = "xyes"; then
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+ #include <exception>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "GCC visibility push" >/dev/null 2>&1; then
-+
+ 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'
+@@ -32634,13 +32984,13 @@
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   $EGREP "GCC visibility push" >/dev/null 2>&1; then
+ 
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +      { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+      kde_stdc_visibility_patched=yes
-+else
-+
+       kde_stdc_visibility_patched=yes
+ else
+ 
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +      { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+      { 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
-+                   visibility support. Disabling -fvisibility=hidden" >&2;}
-+
-+      kde_stdc_visibility_patched=no
-+fi
-+rm -f conftest*
-+
-+
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+    kde_have_gcc_visibility=no
-+
+       { 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
+@@ -32660,16 +33010,15 @@
+ 
+     kde_have_gcc_visibility=no
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
+-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
 +echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6; }
-+kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -32696,34 +33045,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -49274,92 +34284,87 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -32736,28 +33083,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+
-+      kde_have_gcc_visibility=yes
+  :
+ 
+       kde_have_gcc_visibility=yes
+-                              # Check whether --enable-gcc-hidden-visibility or --disable-gcc-hidden-visibility was given.
 +                              # Check whether --enable-gcc-hidden-visibility was given.
-+if test "${enable_gcc_hidden_visibility+set}" = set; then
+ if test "${enable_gcc_hidden_visibility+set}" = set; then
+-  enableval="$enable_gcc_hidden_visibility"
+-  kde_have_gcc_visibility=$enableval
 +  enableval=$enable_gcc_hidden_visibility; kde_have_gcc_visibility=$enableval
-+else
-+  kde_have_gcc_visibility=no
+ else
+   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
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-           ac_ext=cc
 +           ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+
-+          safe_CXXFLAGS=$CXXFLAGS
-+          CXXFLAGS="$CXXFLAGS $all_includes"
-+
-+          cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <qglobal.h>
-+#if Q_EXPORT - 0 != 0
-+/* if this compiles, then Q_EXPORT is undefined */
-+/* if Q_EXPORT is nonempty, this will break compilation */
-+#endif
-+
-+int
-+main ()
-+{
-+/* elvis is alive */
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -32792,35 +33138,31 @@
+ }
+ _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;;
@@ -49367,88 +34372,76 @@
 +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
+   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_cxx_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_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
-+
+   kde_cv_val_qt_gcc_visibility_patched=no
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_qt_gcc_visibility_patched=yes
 +	kde_cv_val_qt_gcc_visibility_patched=yes
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+          CXXFLAGS=$safe_CXXFLAGS
-+          ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+fi
+ 
+           CXXFLAGS=$safe_CXXFLAGS
+           ac_ext=c
+@@ -32832,21 +33174,20 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
+-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
 +echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6; }
-+
-+      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
-+        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+
+ 
+       if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+         CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ 
+-    echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
+-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
 +echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6; }
-+if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-         ac_ext=cc
 +         ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+
-+        safe_CXXFLAGS=$CXXFLAGS
-+        safe_LDFLAGS=$LDFLAGS
-+        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+        LDFLAGS="$LDFLAGS -shared -fPIC"
-+
-+        cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-+	  #include <string>
-+          int some_function( void ) __attribute__ ((visibility("default")));
-+          int some_function( void )
-+          {
-+	    std::string s("blafasel");
-+            return 0;
-+          }
-+
-+int
-+main ()
-+{
-+/* elvis is alive */
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -32886,35 +33227,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -49456,119 +34449,123 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
-+
+   kde_cv_val_gcc_visibility_bug=no
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_gcc_visibility_bug=yes
 +	kde_cv_val_gcc_visibility_bug=yes
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+
-+        CXXFLAGS=$safe_CXXFLAGS
-+        LDFLAGS=$safe_LDFLAGS
-+        ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ 
+         CXXFLAGS=$safe_CXXFLAGS
+@@ -32928,8 +33266,8 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
+-echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
 +echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; }
-+
-+    if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+    fi
-+
-+
-+        HAVE_GCC_VISIBILITY=1
-+
-+cat >>confdefs.h <<_ACEOF
-+#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
-+_ACEOF
-+
-+      fi
-+
-+else
+ 
+     if test x$kde_cv_val_gcc_visibility_bug = xno; then
+       CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+@@ -32945,8 +33283,8 @@
+       fi
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+  fi
-+
-+
-+
-+
-+
-+  want_pam=
-+
+  :
+ 
+ fi
+@@ -32959,10 +33297,9 @@
+ 
+   want_pam=
+ 
+-# Check whether --with-pam or --without-pam was given.
 +# Check whether --with-pam was given.
-+if test "${with_pam+set}" = set; then
+ if test "${with_pam+set}" = set; then
+-  withval="$with_pam"
+-   if test "x$withval" = "xyes"; then
 +  withval=$with_pam;  if test "x$withval" = "xyes"; then
-+        want_pam=yes
-+        pam_service=kde
-+      elif test "x$withval" = "xno"; then
-+        want_pam=no
-+      else
-+        want_pam=yes
-+        pam_service=$withval
-+      fi
-+
-+else
-+   pam_service=kde
+         want_pam=yes
+         pam_service=kde
+       elif test "x$withval" = "xno"; then
+@@ -32974,13 +33311,14 @@
+ 
+ else
+    pam_service=kde
+-fi;
 +fi
 +
-+
-+  use_pam=
-+  PAMLIBS=
-+  if test "x$want_pam" != xno; then
+ 
+   use_pam=
+   PAMLIBS=
+   if test "x$want_pam" != xno; then
+-    echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
+-echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
 +echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_pam_pam_start+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpam $LIBDL $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_pam_pam_start+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -32993,70 +33331,67 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pam_start ();
-+int
-+main ()
-+{
+ #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 pam_start ();
+ int
+ main ()
+ {
+-pam_start ();
 +return pam_start ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -49576,54 +34573,77 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_pam_pam_start=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_pam_pam_start=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_pam_pam_start=no
 +	ac_cv_lib_pam_pam_start=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
+-echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
 +echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; }
-+if test $ac_cv_lib_pam_pam_start = yes; then
-+
-+      if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
+ if test $ac_cv_lib_pam_pam_start = yes; then
+ 
+       if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
+-echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
 +echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
 +echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
+-echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
 +echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <security/pam_appl.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33067,41 +33402,37 @@
+ #include <security/pam_appl.h>
+ _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;;
@@ -49631,38 +34651,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
+-echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
 +echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <security/pam_appl.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33110,24 +33441,22 @@
+ /* end confdefs.h.  */
+ #include <security/pam_appl.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -49670,88 +34711,102 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33135,9 +33464,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -33161,42 +33491,35 @@
+ echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: security/pam_appl.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: security/pam_appl.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: security/pam_appl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
+-echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
 +echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_security_pam_appl_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_security_pam_appl_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
 +echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_security_pam_appl_h = yes; then
-+   pam_header=security/pam_appl.h
-+else
-+   if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
+ 
+ fi
+ if test $ac_cv_header_security_pam_appl_h = yes; then
+    pam_header=security/pam_appl.h
+ else
+    if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
+-echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
 +echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5
 +echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking pam/pam_appl.h usability" >&5
+-echo $ECHO_N "checking pam/pam_appl.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking pam/pam_appl.h usability" >&5
 +echo $ECHO_N "checking pam/pam_appl.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <pam/pam_appl.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33207,41 +33530,37 @@
+ #include <pam/pam_appl.h>
+ _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;;
@@ -49759,38 +34814,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking pam/pam_appl.h presence" >&5
+-echo $ECHO_N "checking pam/pam_appl.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking pam/pam_appl.h presence" >&5
 +echo $ECHO_N "checking pam/pam_appl.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <pam/pam_appl.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33250,24 +33569,22 @@
+ /* end confdefs.h.  */
+ #include <pam/pam_appl.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -49798,189 +34874,148 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33275,9 +33592,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -33301,25 +33619,18 @@
+ echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
+-echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
 +echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_pam_pam_appl_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_pam_pam_appl_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5
 +echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_pam_pam_appl_h = yes; then
-+   pam_header=pam/pam_appl.h
-+else
-+
-+    { echo "$as_me:$LINENO: WARNING: PAM detected, but no headers found!
-+Make sure you have the necessary development packages installed." >&5
-+echo "$as_me: WARNING: PAM detected, but no headers found!
-+Make sure you have the necessary development packages installed." >&2;}
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    if test -z "$pam_header"; then
-+      if test "x$want_pam" = xyes; then
-+        { { echo "$as_me:$LINENO: error: --with-pam was specified, but cannot compile with PAM!" >&5
-+echo "$as_me: error: --with-pam was specified, but cannot compile with PAM!" >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+    else
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PAM 1
-+_ACEOF
-+
-+      PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
-+      use_pam=yes
-+
-+            if test "$pam_header" = "pam/pam_appl.h"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PAM_PAM_APPL_H 1
-+_ACEOF
-+
-+      fi
-+
+ 
+ fi
+ if test $ac_cv_header_pam_pam_appl_h = yes; then
+@@ -33366,8 +33677,8 @@
+ 
+       fi
+ 
+-            echo "$as_me:$LINENO: checking for const pam_message" >&5
+-echo $ECHO_N "checking for const pam_message... $ECHO_C" >&6
 +            { echo "$as_me:$LINENO: checking for const pam_message" >&5
 +echo $ECHO_N "checking for const pam_message... $ECHO_C" >&6; }
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$pam_header>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "struct pam_message" >/dev/null 2>&1; then
-+   cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$pam_header>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "const struct pam_message" >/dev/null 2>&1; then
+       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33390,11 +33701,11 @@
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   $EGREP "const struct pam_message" >/dev/null 2>&1; then
+-  echo "$as_me:$LINENO: result: const: Linux-type PAM" >&5
+-echo "${ECHO_T}const: Linux-type PAM" >&6
 +  { echo "$as_me:$LINENO: result: const: Linux-type PAM" >&5
 +echo "${ECHO_T}const: Linux-type PAM" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: nonconst: Sun-type PAM" >&5
+-echo "${ECHO_T}nonconst: Sun-type PAM" >&6
 +  { echo "$as_me:$LINENO: result: nonconst: Sun-type PAM" >&5
 +echo "${ECHO_T}nonconst: Sun-type PAM" >&6; }
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define PAM_MESSAGE_NONCONST 1
-+_ACEOF
-+
-+
-+fi
-+rm -f conftest*
-+
-+else
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define PAM_MESSAGE_NONCONST 1
+@@ -33405,8 +33716,8 @@
+ rm -f conftest*
+ 
+ else
+-  echo "$as_me:$LINENO: result: not found - assume const, Linux-type PAM" >&5
+-echo "${ECHO_T}not found - assume const, Linux-type PAM" >&6
 +  { echo "$as_me:$LINENO: result: not found - assume const, Linux-type PAM" >&5
 +echo "${ECHO_T}not found - assume const, Linux-type PAM" >&6; }
-+fi
-+rm -f conftest*
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+
+ fi
+ rm -f conftest*
+ 
+@@ -33418,8 +33729,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking for getspent in -lshadow" >&5
+-echo $ECHO_N "checking for getspent in -lshadow... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for getspent in -lshadow" >&5
 +echo $ECHO_N "checking for getspent in -lshadow... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_shadow_getspent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lshadow  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_shadow_getspent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33432,63 +33743,60 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char getspent ();
-+int
-+main ()
-+{
+ #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 getspent ();
+ int
+ main ()
+ {
+-getspent ();
 +return getspent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -49988,65 +35023,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_shadow_getspent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_shadow_getspent=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_shadow_getspent=no
 +	ac_cv_lib_shadow_getspent=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_shadow_getspent" >&5
+-echo "${ECHO_T}$ac_cv_lib_shadow_getspent" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_shadow_getspent" >&5
 +echo "${ECHO_T}$ac_cv_lib_shadow_getspent" >&6; }
-+if test $ac_cv_lib_shadow_getspent = yes; then
-+   LIBSHADOW="-lshadow"
-+      ac_use_shadow=yes
-+
-+else
+ if test $ac_cv_lib_shadow_getspent = yes; then
+    LIBSHADOW="-lshadow"
+       ac_use_shadow=yes
+ 
+ else
+-         echo "$as_me:$LINENO: checking for getspent in -lgen" >&5
+-echo $ECHO_N "checking for getspent in -lgen... $ECHO_C" >&6
 +         { echo "$as_me:$LINENO: checking for getspent in -lgen" >&5
 +echo $ECHO_N "checking for getspent in -lgen... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_gen_getspent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgen  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_gen_getspent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33501,63 +33809,60 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char getspent ();
-+int
-+main ()
-+{
+ #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 getspent ();
+ int
+ main ()
+ {
+-getspent ();
 +return getspent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -50054,86 +35110,100 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_gen_getspent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_gen_getspent=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_gen_getspent=no
 +	ac_cv_lib_gen_getspent=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspent" >&5
+-echo "${ECHO_T}$ac_cv_lib_gen_getspent" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspent" >&5
 +echo "${ECHO_T}$ac_cv_lib_gen_getspent" >&6; }
-+if test $ac_cv_lib_gen_getspent = yes; then
-+   LIBGEN="-lgen"
-+          ac_use_shadow=yes
-+
-+else
+ if test $ac_cv_lib_gen_getspent = yes; then
+    LIBGEN="-lgen"
+           ac_use_shadow=yes
+ 
+ else
+-   echo "$as_me:$LINENO: checking for getspent" >&5
+-echo $ECHO_N "checking for getspent... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for getspent" >&5
 +echo $ECHO_N "checking for getspent... $ECHO_C" >&6; }
-+if test "${ac_cv_func_getspent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define getspent to an innocuous variant, in case <limits.h> declares getspent.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define getspent innocuous_getspent
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char getspent (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef getspent
-+
+ if test "${ac_cv_func_getspent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33584,68 +33889,59 @@
+ 
+ #undef getspent
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char getspent ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 getspent ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_getspent) || defined (__stub___getspent)
 +#if defined __stub_getspent || defined __stub___getspent
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = getspent;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != getspent;
 +return getspent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -50141,240 +35211,198 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_getspent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_func_getspent=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_getspent=no
 +	ac_cv_func_getspent=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_getspent" >&5
+-echo "${ECHO_T}$ac_cv_func_getspent" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_getspent" >&5
 +echo "${ECHO_T}$ac_cv_func_getspent" >&6; }
-+if test $ac_cv_func_getspent = yes; then
-+   ac_use_shadow=yes
-+else
-+   ac_use_shadow=no
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+
-+
+ if test $ac_cv_func_getspent = yes; then
+    ac_use_shadow=yes
+ else
+@@ -33661,14 +33957,13 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking for shadow passwords" >&5
+-echo $ECHO_N "checking for shadow passwords... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for shadow passwords" >&5
 +echo $ECHO_N "checking for shadow passwords... $ECHO_C" >&6; }
-+
-+
+ 
+ 
+-# Check whether --with-shadow or --without-shadow was given.
 +# Check whether --with-shadow was given.
-+if test "${with_shadow+set}" = set; then
+ if test "${with_shadow+set}" = set; then
+-  withval="$with_shadow"
+-   if test "x$withval" != "xno"; then
 +  withval=$with_shadow;  if test "x$withval" != "xno"; then
-+        use_shadow=yes
-+      else
-+        use_shadow=no
-+      fi
-+
-+else
-+
-+      use_shadow="$ac_use_shadow"
-+
+         use_shadow=yes
+       else
+         use_shadow=no
+@@ -33678,19 +33973,20 @@
+ 
+       use_shadow="$ac_use_shadow"
+ 
+-fi;
 +fi
 +
-+
-+  if test "x$use_shadow" = xyes; then
+ 
+   if test "x$use_shadow" = xyes; then
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +    { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_SHADOW 1
-+_ACEOF
-+
-+  else
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SHADOW 1
+ _ACEOF
+ 
+   else
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +    { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+    LIBSHADOW=
-+    LIBGEN=
-+  fi
-+
-+      if test "x$use_shadow" = xyes ||
-+     ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then
-+      case $host in
-+      *-*-freebsd* | *-*-netbsd* | *-*-openbsd*)
-+	SETUIDFLAGS="-m 4755 -o root";;
-+      *)
-+	SETUIDFLAGS="-m 4755";;
-+      esac
-+  fi
-+
-+
-+
-+
-+
-+
-+
-+  if test "x$use_pam" = "xyes"; then
-+    PASSWDLIBS="$PAMLIBS"
-+  else
-+    PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN"
-+  fi
-+
-+          case $host in
-+  *-*-freebsd*)
-+    SETUIDFLAGS="-m 4755 -o root"
-+    ;;
-+  *)
-+    ;;
-+  esac
-+
-+
-+
-+
-+
-+
+     LIBSHADOW=
+     LIBGEN=
+   fi
+@@ -33730,10 +34026,9 @@
+ 
+ 
+ 
+-# Check whether --with-kdm-pam or --without-kdm-pam was given.
 +# Check whether --with-kdm-pam was given.
-+if test "${with_kdm_pam+set}" = set; then
+ if test "${with_kdm_pam+set}" = set; then
+-  withval="$with_kdm_pam"
+-   if test "x$use_pam" = xyes; then
 +  withval=$with_kdm_pam;  if test "x$use_pam" = xyes; then
-+        KDM_PAM_SERVICE=$withval
-+      else
-+        { { echo "$as_me:$LINENO: error: Cannot use use --with-kdm-pam, as no PAM was detected.
-+You may want to enforce it by using --with-pam." >&5
-+echo "$as_me: error: Cannot use use --with-kdm-pam, as no PAM was detected.
-+You may want to enforce it by using --with-pam." >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+
-+else
-+   if test "x$use_pam" = xyes; then
-+        KDM_PAM_SERVICE="$pam_service"
-+      fi
-+
+         KDM_PAM_SERVICE=$withval
+       else
+         { { echo "$as_me:$LINENO: error: Cannot use use --with-kdm-pam, as no PAM was detected.
+@@ -33748,10 +34043,11 @@
+         KDM_PAM_SERVICE="$pam_service"
+       fi
+ 
+-fi;
 +fi
 +
-+    if test -n "$KDM_PAM_SERVICE"; then
+     if test -n "$KDM_PAM_SERVICE"; then
+-      echo "$as_me:$LINENO: result: The PAM service used by kdm will be $KDM_PAM_SERVICE" >&5
+-echo "${ECHO_T}The PAM service used by kdm will be $KDM_PAM_SERVICE" >&6
 +      { echo "$as_me:$LINENO: result: The PAM service used by kdm will be $KDM_PAM_SERVICE" >&5
 +echo "${ECHO_T}The PAM service used by kdm will be $KDM_PAM_SERVICE" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define KDM_PAM_SERVICE "$KDM_PAM_SERVICE"
-+_ACEOF
-+
-+    fi
-+
-+
-+
-+
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define KDM_PAM_SERVICE "$KDM_PAM_SERVICE"
+@@ -33762,10 +34058,9 @@
+ 
+ 
+ 
+-# Check whether --with-kcp-pam or --without-kcp-pam was given.
 +# Check whether --with-kcp-pam was given.
-+if test "${with_kcp_pam+set}" = set; then
+ if test "${with_kcp_pam+set}" = set; then
+-  withval="$with_kcp_pam"
+-   if test "x$use_pam" = xyes; then
 +  withval=$with_kcp_pam;  if test "x$use_pam" = xyes; then
-+        KCHECKPASS_PAM_SERVICE=$withval
-+      else
-+        { { echo "$as_me:$LINENO: error: Cannot use use --with-kcp-pam, as no PAM was detected.
-+You may want to enforce it by using --with-pam." >&5
-+echo "$as_me: error: Cannot use use --with-kcp-pam, as no PAM was detected.
-+You may want to enforce it by using --with-pam." >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+
-+else
-+   if test "x$use_pam" = xyes; then
-+        KCHECKPASS_PAM_SERVICE="$pam_service"
-+      fi
-+
+         KCHECKPASS_PAM_SERVICE=$withval
+       else
+         { { echo "$as_me:$LINENO: error: Cannot use use --with-kcp-pam, as no PAM was detected.
+@@ -33780,10 +34075,11 @@
+         KCHECKPASS_PAM_SERVICE="$pam_service"
+       fi
+ 
+-fi;
 +fi
 +
-+    if test -n "$KCHECKPASS_PAM_SERVICE"; then
+     if test -n "$KCHECKPASS_PAM_SERVICE"; then
+-      echo "$as_me:$LINENO: result: The PAM service used by kcheckpass will be $KCHECKPASS_PAM_SERVICE" >&5
+-echo "${ECHO_T}The PAM service used by kcheckpass will be $KCHECKPASS_PAM_SERVICE" >&6
 +      { echo "$as_me:$LINENO: result: The PAM service used by kcheckpass will be $KCHECKPASS_PAM_SERVICE" >&5
 +echo "${ECHO_T}The PAM service used by kcheckpass will be $KCHECKPASS_PAM_SERVICE" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define KCHECKPASS_PAM_SERVICE "$KCHECKPASS_PAM_SERVICE"
-+_ACEOF
-+
-+    fi
-+
-+
-+
-+
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define KCHECKPASS_PAM_SERVICE "$KCHECKPASS_PAM_SERVICE"
+@@ -33794,10 +34090,9 @@
+ 
+ 
+ 
+-# Check whether --with-kss-pam or --without-kss-pam was given.
 +# Check whether --with-kss-pam was given.
-+if test "${with_kss_pam+set}" = set; then
+ if test "${with_kss_pam+set}" = set; then
+-  withval="$with_kss_pam"
+-   if test "x$use_pam" = xyes; then
 +  withval=$with_kss_pam;  if test "x$use_pam" = xyes; then
-+        KSCREENSAVER_PAM_SERVICE=$withval
-+      else
-+        { { echo "$as_me:$LINENO: error: Cannot use use --with-kss-pam, as no PAM was detected.
-+You may want to enforce it by using --with-pam." >&5
-+echo "$as_me: error: Cannot use use --with-kss-pam, as no PAM was detected.
-+You may want to enforce it by using --with-pam." >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+
-+else
-+   if test "x$use_pam" = xyes; then
-+        KSCREENSAVER_PAM_SERVICE="$pam_service"
-+      fi
-+
+         KSCREENSAVER_PAM_SERVICE=$withval
+       else
+         { { echo "$as_me:$LINENO: error: Cannot use use --with-kss-pam, as no PAM was detected.
+@@ -33812,10 +34107,11 @@
+         KSCREENSAVER_PAM_SERVICE="$pam_service"
+       fi
+ 
+-fi;
 +fi
 +
-+    if test -n "$KSCREENSAVER_PAM_SERVICE"; then
+     if test -n "$KSCREENSAVER_PAM_SERVICE"; then
+-      echo "$as_me:$LINENO: result: The PAM service used by kscreensaver will be $KSCREENSAVER_PAM_SERVICE" >&5
+-echo "${ECHO_T}The PAM service used by kscreensaver will be $KSCREENSAVER_PAM_SERVICE" >&6
 +      { echo "$as_me:$LINENO: result: The PAM service used by kscreensaver will be $KSCREENSAVER_PAM_SERVICE" >&5
 +echo "${ECHO_T}The PAM service used by kscreensaver will be $KSCREENSAVER_PAM_SERVICE" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define KSCREENSAVER_PAM_SERVICE "$KSCREENSAVER_PAM_SERVICE"
-+_ACEOF
-+
-+    fi
-+
-+
-+
-+
-+
-+
-+
-+
-+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`
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define KSCREENSAVER_PAM_SERVICE "$KSCREENSAVER_PAM_SERVICE"
+@@ -33833,9 +34129,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`
+-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <$ac_hdr>
-+
-+int
-+main ()
-+{
-+if ((DIR *) 0)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -33857,38 +34153,35 @@
+ }
+ _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;;
@@ -50382,67 +35410,91 @@
 +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
+   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
 +  (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=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
+ 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: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +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
-+_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
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+@@ -33900,13 +34193,12 @@
+ 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
 +  { 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
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ 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
+@@ -33914,126 +34206,83 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char opendir ();
-+int
-+main ()
-+{
+ #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 opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+   ;
+   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
 +for ac_lib in '' dir; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -50458,75 +35510,161 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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"
 +  (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
-+
-+
+ 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 ();
+-  ;
+-  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
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
 +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
+ 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"
 +{ 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
+ 
+ fi
+ 
+ else
+-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
 +  { 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
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ 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
+@@ -34041,122 +34290,80 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char opendir ();
-+int
-+main ()
-+{
+ #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 opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+   ;
+   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
 +for ac_lib in '' x; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -50542,73 +35680,153 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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"
 +  (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
-+
-+
+ 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
+-/* 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
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
 +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
+ 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"
 +{ 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
-+
-+fi
-+
+ 
+ fi
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34180,35 +34387,31 @@
+ }
+ _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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -50616,104 +35834,51 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $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
-+
+   ac_cv_header_stdc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_stdc=no
 +	ac_cv_header_stdc=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "memchr" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -34264,6 +34467,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <ctype.h>
 +#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "free" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+  if test "$cross_compiling" = yes; then
-+  :
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <ctype.h>
-+#include <stdlib.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+	|| toupper (i) != TOUPPER (i))
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -34283,18 +34487,27 @@
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
 +      return 2;
 +  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -50721,110 +35886,72 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  :
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_header_stdc=no
-+fi
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34307,12 +34520,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
 +
 +
-+fi
-+fi
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define STDC_HEADERS 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_header in sys/time.h crypt.h \
-+	sys/select.h sys/ioctl.h sys/stropts.h stropts.h termio.h termios.h sys/termios.h \
-+	lastlog.h sys/socket.h sys/sockio.h \
-+	sys/m_wait.h ncurses.h paths.h login_cap.h syslog.h \
-+	sys/wait.h sys/ucred.h sys/mount.h floatingpoint.h fstab.h mntent.h \
-+	Alib.h libutil.h util.h time.h limits.h vfork.h string.h float.h \
-+	math.h nan.h ieeefp.h
-+
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if test $ac_cv_header_stdc = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -34365,18 +34580,19 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34387,41 +34603,37 @@
+ #include <$ac_header>
+ _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;;
@@ -50832,38 +35959,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34430,24 +34642,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -50871,95 +36019,105 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34455,9 +34665,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -34481,25 +34692,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+if test "${ac_cv_header_pty_h+set}" = set; then
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -34512,17 +34717,17 @@
+ done
+ 
+ if test "${ac_cv_header_pty_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for pty.h" >&5
+-echo $ECHO_N "checking for pty.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for pty.h" >&5
 +echo $ECHO_N "checking for pty.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_pty_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_pty_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_pty_h" >&5
+-echo "${ECHO_T}$ac_cv_header_pty_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_pty_h" >&5
 +echo "${ECHO_T}$ac_cv_header_pty_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking pty.h usability" >&5
+-echo $ECHO_N "checking pty.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking pty.h usability" >&5
 +echo $ECHO_N "checking pty.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <pty.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34533,41 +34738,37 @@
+ #include <pty.h>
+ _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;;
@@ -50967,38 +36125,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking pty.h presence" >&5
+-echo $ECHO_N "checking pty.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking pty.h presence" >&5
 +echo $ECHO_N "checking pty.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <pty.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34576,24 +34777,22 @@
+ /* end confdefs.h.  */
+ #include <pty.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51006,116 +36185,121 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34601,9 +34800,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -34627,31 +34827,24 @@
+ echo "$as_me: WARNING: pty.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: pty.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: pty.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: pty.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: pty.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pty.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: pty.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: pty.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: pty.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pty.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: pty.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pty.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: pty.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pty.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: pty.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pty.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: pty.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pty.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: pty.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for pty.h" >&5
+-echo $ECHO_N "checking for pty.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for pty.h" >&5
 +echo $ECHO_N "checking for pty.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_pty_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_pty_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_pty_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_pty_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_pty_h" >&5
+-echo "${ECHO_T}$ac_cv_header_pty_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_pty_h" >&5
 +echo "${ECHO_T}$ac_cv_header_pty_h" >&6; }
-+
-+fi
-+
-+
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for ptsname" >&5
+-echo $ECHO_N "checking for ptsname... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for ptsname" >&5
 +echo $ECHO_N "checking for ptsname... $ECHO_C" >&6; }
-+if test "${ac_cv_func_ptsname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define ptsname to an innocuous variant, in case <limits.h> declares ptsname.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define ptsname innocuous_ptsname
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char ptsname (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef ptsname
-+
+ if test "${ac_cv_func_ptsname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34678,73 +34871,64 @@
+ 
+ #undef ptsname
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char ptsname ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 ptsname ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_ptsname) || defined (__stub___ptsname)
 +#if defined __stub_ptsname || defined __stub___ptsname
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = ptsname;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != ptsname;
 +return ptsname ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51123,56 +36307,70 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_ptsname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_func_ptsname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_ptsname=no
 +	ac_cv_func_ptsname=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_ptsname" >&5
+-echo "${ECHO_T}$ac_cv_func_ptsname" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_ptsname" >&5
 +echo "${ECHO_T}$ac_cv_func_ptsname" >&6; }
-+
-+
-+
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for main in -lAlib" >&5
+-echo $ECHO_N "checking for main in -lAlib... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for main in -lAlib" >&5
 +echo $ECHO_N "checking for main in -lAlib... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Alib_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lAlib  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
+ if test "${ac_cv_lib_Alib_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34761,53 +34945,50 @@
+ int
+ main ()
+ {
+-main ();
 +return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51180,86 +36378,100 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_Alib_main=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Alib_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Alib_main=no
 +	ac_cv_lib_Alib_main=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Alib_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_Alib_main" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Alib_main" >&5
 +echo "${ECHO_T}$ac_cv_lib_Alib_main" >&6; }
-+if test $ac_cv_lib_Alib_main = yes; then
-+  LIBALIB="-lAlib"
-+fi
-+
-+
+ if test $ac_cv_lib_Alib_main = yes; then
+   LIBALIB="-lAlib"
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for clnttcp_create" >&5
+-echo $ECHO_N "checking for clnttcp_create... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for clnttcp_create" >&5
 +echo $ECHO_N "checking for clnttcp_create... $ECHO_C" >&6; }
-+if test "${ac_cv_func_clnttcp_create+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define clnttcp_create to an innocuous variant, in case <limits.h> declares clnttcp_create.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define clnttcp_create innocuous_clnttcp_create
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char clnttcp_create (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef clnttcp_create
-+
+ if test "${ac_cv_func_clnttcp_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34834,74 +35015,65 @@
+ 
+ #undef clnttcp_create
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char clnttcp_create ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 clnttcp_create ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_clnttcp_create) || defined (__stub___clnttcp_create)
 +#if defined __stub_clnttcp_create || defined __stub___clnttcp_create
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = clnttcp_create;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != clnttcp_create;
 +return clnttcp_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51267,63 +36479,84 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_clnttcp_create=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_func_clnttcp_create=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_clnttcp_create=no
 +	ac_cv_func_clnttcp_create=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_clnttcp_create" >&5
+-echo "${ECHO_T}$ac_cv_func_clnttcp_create" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_clnttcp_create" >&5
 +echo "${ECHO_T}$ac_cv_func_clnttcp_create" >&6; }
-+if test $ac_cv_func_clnttcp_create = yes; then
-+  :
-+else
-+
+ if test $ac_cv_func_clnttcp_create = yes; then
+   :
+ else
+ 
+-  echo "$as_me:$LINENO: checking for clnttcp_create in -lnsl" >&5
+-echo $ECHO_N "checking for clnttcp_create in -lnsl... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for clnttcp_create in -lnsl" >&5
 +echo $ECHO_N "checking for clnttcp_create in -lnsl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_nsl_clnttcp_create+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_nsl_clnttcp_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34914,56 +35086,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char clnttcp_create ();
-+int
-+main ()
-+{
+ #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 clnttcp_create ();
+ int
+ main ()
+ {
+-clnttcp_create ();
 +return clnttcp_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51331,62 +36564,75 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_clnttcp_create=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_nsl_clnttcp_create=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_nsl_clnttcp_create=no
 +	ac_cv_lib_nsl_clnttcp_create=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_clnttcp_create" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_clnttcp_create" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_clnttcp_create" >&5
 +echo "${ECHO_T}$ac_cv_lib_nsl_clnttcp_create" >&6; }
-+if test $ac_cv_lib_nsl_clnttcp_create = yes; then
-+  LIBRPC="-lnsl"
-+fi
-+
-+fi
-+
-+
-+
+ if test $ac_cv_lib_nsl_clnttcp_create = yes; then
+   LIBRPC="-lnsl"
+ fi
+@@ -34972,8 +35141,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for main in -lossaudio" >&5
+-echo $ECHO_N "checking for main in -lossaudio... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for main in -lossaudio" >&5
 +echo $ECHO_N "checking for main in -lossaudio... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ossaudio_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lossaudio  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
+ if test "${ac_cv_lib_ossaudio_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34990,54 +35159,51 @@
+ int
+ main ()
+ {
+-main ();
 +return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51394,60 +36640,74 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_ossaudio_main=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_ossaudio_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ossaudio_main=no
 +	ac_cv_lib_ossaudio_main=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5
 +echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6; }
-+if test $ac_cv_lib_ossaudio_main = yes; then
-+  LIBOSSAUDIO="-lossaudio"
-+fi
-+
-+
-+
+ if test $ac_cv_lib_ossaudio_main = yes; then
+   LIBOSSAUDIO="-lossaudio"
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for main in -lcfg" >&5
+-echo $ECHO_N "checking for main in -lcfg... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for main in -lcfg" >&5
 +echo $ECHO_N "checking for main in -lcfg... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_cfg_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcfg  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
+ if test "${ac_cv_lib_cfg_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35054,52 +35220,49 @@
+ int
+ main ()
+ {
+-main ();
 +return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51455,58 +36715,72 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_cfg_main=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_cfg_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_cfg_main=no
 +	ac_cv_lib_cfg_main=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_cfg_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_cfg_main" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_cfg_main" >&5
 +echo "${ECHO_T}$ac_cv_lib_cfg_main" >&6; }
-+if test $ac_cv_lib_cfg_main = yes; then
-+  LIBCFG="-lcfg"
-+fi
-+
+ if test $ac_cv_lib_cfg_main = yes; then
+   LIBCFG="-lcfg"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for main in -lodm" >&5
+-echo $ECHO_N "checking for main in -lodm... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for main in -lodm" >&5
 +echo $ECHO_N "checking for main in -lodm... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_odm_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lodm  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
+ if test "${ac_cv_lib_odm_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35116,46 +35279,43 @@
+ int
+ main ()
+ {
+-main ();
 +return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51514,67 +36788,88 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_odm_main=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_odm_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_odm_main=no
 +	ac_cv_lib_odm_main=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_odm_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_odm_main" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_odm_main" >&5
 +echo "${ECHO_T}$ac_cv_lib_odm_main" >&6; }
-+if test $ac_cv_lib_odm_main = yes; then
-+  LIBODM="-lodm"
-+fi
-+
-+
-+
-+kde_have_setupterm=yes
+ if test $ac_cv_lib_odm_main = yes; then
+   LIBODM="-lodm"
+ fi
+@@ -35163,8 +35323,8 @@
+ 
+ 
+ kde_have_setupterm=yes
+-echo "$as_me:$LINENO: checking for setupterm in -lcurses" >&5
+-echo $ECHO_N "checking for setupterm in -lcurses... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for setupterm in -lcurses" >&5
 +echo $ECHO_N "checking for setupterm in -lcurses... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_curses_setupterm+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcurses  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_curses_setupterm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35177,61 +35337,58 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char setupterm ();
-+int
-+main ()
-+{
+ #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 setupterm ();
+ int
+ main ()
+ {
+-setupterm ();
 +return setupterm ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51582,63 +36877,84 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_curses_setupterm=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_curses_setupterm=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_curses_setupterm=no
 +	ac_cv_lib_curses_setupterm=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_curses_setupterm" >&5
+-echo "${ECHO_T}$ac_cv_lib_curses_setupterm" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_curses_setupterm" >&5
 +echo "${ECHO_T}$ac_cv_lib_curses_setupterm" >&6; }
-+if test $ac_cv_lib_curses_setupterm = yes; then
-+  LIBCURSES=-lcurses
-+else
+ if test $ac_cv_lib_curses_setupterm = yes; then
+   LIBCURSES=-lcurses
+ else
+-  echo "$as_me:$LINENO: checking for setupterm in -lncurses" >&5
+-echo $ECHO_N "checking for setupterm in -lncurses... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for setupterm in -lncurses" >&5
 +echo $ECHO_N "checking for setupterm in -lncurses... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ncurses_setupterm+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lncurses  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_ncurses_setupterm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35244,61 +35401,58 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char setupterm ();
-+int
-+main ()
-+{
+ #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 setupterm ();
+ int
+ main ()
+ {
+-setupterm ();
 +return setupterm ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51646,63 +36962,84 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_ncurses_setupterm=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_ncurses_setupterm=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ncurses_setupterm=no
 +	ac_cv_lib_ncurses_setupterm=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_setupterm" >&5
+-echo "${ECHO_T}$ac_cv_lib_ncurses_setupterm" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_setupterm" >&5
 +echo "${ECHO_T}$ac_cv_lib_ncurses_setupterm" >&6; }
-+if test $ac_cv_lib_ncurses_setupterm = yes; then
-+  LIBCURSES=-lncurses
-+else
+ if test $ac_cv_lib_ncurses_setupterm = yes; then
+   LIBCURSES=-lncurses
+ else
+-  echo "$as_me:$LINENO: checking for setupterm in -lmytinfo" >&5
+-echo $ECHO_N "checking for setupterm in -lmytinfo... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for setupterm in -lmytinfo" >&5
 +echo $ECHO_N "checking for setupterm in -lmytinfo... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_mytinfo_setupterm+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmytinfo  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_mytinfo_setupterm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35311,56 +35465,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char setupterm ();
-+int
-+main ()
-+{
+ #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 setupterm ();
+ int
+ main ()
+ {
+-setupterm ();
 +return setupterm ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51710,102 +37047,102 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_mytinfo_setupterm=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_mytinfo_setupterm=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_mytinfo_setupterm=no
 +	ac_cv_lib_mytinfo_setupterm=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_mytinfo_setupterm" >&5
+-echo "${ECHO_T}$ac_cv_lib_mytinfo_setupterm" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mytinfo_setupterm" >&5
 +echo "${ECHO_T}$ac_cv_lib_mytinfo_setupterm" >&6; }
-+if test $ac_cv_lib_mytinfo_setupterm = yes; then
-+  LIBCURSES=-lmytinfo
-+else
-+  kde_have_setupterm=no
-+fi
-+
-+fi
-+
-+fi
-+
-+
-+
-+
-+if test "$kde_have_setupterm" = "yes"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SETUPTERM 1
-+_ACEOF
-+
-+fi
-+
+ if test $ac_cv_lib_mytinfo_setupterm = yes; then
+   LIBCURSES=-lmytinfo
+ else
+@@ -35382,8 +35533,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for res_init" >&5
+-echo $ECHO_N "checking for res_init... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for res_init" >&5
 +echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
-+if test "${ac_cv_func_res_init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define res_init to an innocuous variant, in case <limits.h> declares res_init.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define res_init innocuous_res_init
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char res_init (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef res_init
-+
+ if test "${ac_cv_func_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35410,73 +35561,64 @@
+ 
+ #undef res_init
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char res_init ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 res_init ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_res_init) || defined (__stub___res_init)
 +#if defined __stub_res_init || defined __stub___res_init
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = res_init;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != res_init;
 +return res_init ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51813,62 +37150,83 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_res_init=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_func_res_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_res_init=no
 +	ac_cv_func_res_init=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5
+-echo "${ECHO_T}$ac_cv_func_res_init" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5
 +echo "${ECHO_T}$ac_cv_func_res_init" >&6; }
-+if test $ac_cv_func_res_init = yes; then
-+  :
-+else
+ if test $ac_cv_func_res_init = yes; then
+   :
+ else
+-  echo "$as_me:$LINENO: checking for res_init in -lresolv" >&5
+-echo $ECHO_N "checking for res_init in -lresolv... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for res_init in -lresolv" >&5
 +echo $ECHO_N "checking for res_init in -lresolv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_resolv_res_init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lresolv $LIBSOCKET $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_resolv_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35489,56 +35631,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char res_init ();
-+int
-+main ()
-+{
+ #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 res_init ();
+ int
+ main ()
+ {
+-res_init ();
 +return res_init ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -51876,72 +37234,77 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_resolv_res_init=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_resolv_res_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_resolv_res_init=no
 +	ac_cv_lib_resolv_res_init=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_resolv_res_init" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_init" >&5
 +echo "${ECHO_T}$ac_cv_lib_resolv_res_init" >&6; }
-+if test $ac_cv_lib_resolv_res_init = yes; then
-+  LIBRESOLV="-lresolv"
-+fi
-+
-+fi
-+
-+
-+
+ if test $ac_cv_lib_resolv_res_init = yes; then
+   LIBRESOLV="-lresolv"
+ fi
+@@ -35547,7 +35686,7 @@
+ 
+ 
+ 
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
+ 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'
+@@ -35556,8 +35695,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
-+if test "${ac_cv_header_time+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <time.h>
-+
-+int
-+main ()
-+{
-+if ((struct tm *) 0)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35581,38 +35720,34 @@
+ }
+ _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;;
@@ -51949,63 +37312,68 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_time=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_header_time=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_time=no
 +	ac_cv_header_time=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_header_time" >&5
+-echo "${ECHO_T}$ac_cv_header_time" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
 +echo "${ECHO_T}$ac_cv_header_time" >&6; }
-+if test $ac_cv_header_time = yes; then
+ if test $ac_cv_header_time = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -35635,9 +35770,11 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-echo "$as_me:$LINENO: checking for working long double with more range or precision than double" >&5
+-echo $ECHO_N "checking for working long double with more range or precision than double... $ECHO_C" >&6
+-if test "${ac_cv_c_long_double+set}" = set; then
 +
-+cat >>confdefs.h <<\_ACEOF
-+#define TIME_WITH_SYS_TIME 1
-+_ACEOF
 +
-+fi
-+
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_BOOL 1
-+_ACEOF
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
 +  { echo "$as_me:$LINENO: checking for long double with more range or precision than double" >&5
 +echo $ECHO_N "checking for long double with more range or precision than double... $ECHO_C" >&6; }
 +if test "${ac_cv_type_long_double_wider+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <float.h>
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -35647,13 +35784,27 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <float.h>
+-	  long double foo = 0.0;
 +	    long double const a[] =
 +	      {
 +		 0.0L, DBL_MIN, DBL_MAX, DBL_EPSILON,
@@ -52018,22 +37386,27 @@
 +			+ (x ? f (x) : 'c'));
 +	    }
 +
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(/* Using '|' rather than '||' catches a GCC 2.95.2 x86 bug.  */
+-	  (DBL_MAX < LDBL_MAX) | (LDBL_EPSILON < DBL_EPSILON)
+-	  | (DBL_MAX_EXP < LDBL_MAX_EXP) | (DBL_MANT_DIG < LDBL_MANT_DIG))];
 +static int test_array [1 - 2 * !((0 < ((DBL_MAX_EXP < LDBL_MAX_EXP)
 +		   + (DBL_MANT_DIG < LDBL_MANT_DIG)
 +		   - (LDBL_MAX_EXP < DBL_MAX_EXP)
 +		   - (LDBL_MANT_DIG < DBL_MANT_DIG)))
 +	    && (int) LDBL_EPSILON == 0
 +	  )];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -35661,48 +35812,53 @@
+ }
+ _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;;
@@ -52041,25 +37414,45 @@
 +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
+   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
+-  ac_cv_c_long_double=yes
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
 +  ac_cv_type_long_double_wider=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
+ 
+-ac_cv_c_long_double=no
 +	ac_cv_type_long_double_wider=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_c_long_double" >&5
+-echo "${ECHO_T}$ac_cv_c_long_double" >&6
+-if test $ac_cv_c_long_double = yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_long_double_wider" >&5
 +echo "${ECHO_T}$ac_cv_type_long_double_wider" >&6; }
 +  if test $ac_cv_type_long_double_wider = yes; then
@@ -52072,90 +37465,75 @@
 +
 +    ac_cv_c_long_double=$ac_cv_type_long_double_wider
 +    if test $ac_cv_c_long_double = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LONG_DOUBLE 1
-+_ACEOF
-+
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LONG_DOUBLE 1
+ _ACEOF
+ 
+-fi
 +    fi
-+
+ 
+-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
 +echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
-+if test "${ac_cv_type_uid_t+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "uid_t" >/dev/null 2>&1; then
-+  ac_cv_type_uid_t=yes
-+else
-+  ac_cv_type_uid_t=no
-+fi
-+rm -f conftest*
-+
-+fi
+ if test "${ac_cv_type_uid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35724,8 +35880,8 @@
+ rm -f conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
+-echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
 +echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
-+if test $ac_cv_type_uid_t = no; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define uid_t int
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define gid_t int
-+_ACEOF
-+
-+fi
-+
+ if test $ac_cv_type_uid_t = no; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -35739,8 +35895,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
+-echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
 +echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6; }
-+if test "${ac_cv_type_getgroups+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  ac_cv_type_getgroups=cross
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Thanks to Mike Rendell for this test.  */
+ if test "${ac_cv_type_getgroups+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35754,7 +35910,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ /* Thanks to Mike Rendell for this test.  */
+-#include <sys/types.h>
 +$ac_includes_default
-+#define NGID 256
-+#undef MAX
-+#define MAX(x, y) ((x) > (y) ? (x) : (y))
-+
-+int
-+main ()
-+{
-+  gid_t gidset[NGID];
-+  int i, n;
+ #define NGID 256
+ #undef MAX
+ #define MAX(x, y) ((x) > (y) ? (x) : (y))
+@@ -35764,7 +35920,7 @@
+ {
+   gid_t gidset[NGID];
+   int i, n;
+-  union { gid_t gval; long lval; }  val;
 +  union { gid_t gval; long int lval; }  val;
-+
-+  val.lval = -1;
-+  for (i = 0; i < NGID; i++)
-+    gidset[i] = val.gval;
-+  n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
-+		 gidset);
-+  /* Exit non-zero if getgroups seems to require an array of ints.  This
+ 
+   val.lval = -1;
+   for (i = 0; i < NGID; i++)
+@@ -35772,18 +35928,28 @@
+   n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
+ 		 gidset);
+   /* Exit non-zero if getgroups seems to require an array of ints.  This
+-     happens when gid_t is short but getgroups modifies an array of ints.  */
+-  exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0);
 +     happens when gid_t is short int but getgroups modifies an array
 +     of ints.  */
 +  return n > 0 && gidset[n] != val.gval;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -52163,85 +37541,75 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_type_getgroups=gid_t
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_type_getgroups=int
-+fi
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -35796,8 +35962,10 @@
+ ( exit $ac_status )
+ ac_cv_type_getgroups=int
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
 +
 +
-+if test $ac_cv_type_getgroups = cross; then
-+        cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <unistd.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then
-+  ac_cv_type_getgroups=gid_t
-+else
-+  ac_cv_type_getgroups=int
-+fi
-+rm -f conftest*
-+
-+fi
-+fi
+ if test $ac_cv_type_getgroups = cross; then
+         cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -35818,8 +35986,8 @@
+ 
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
+-echo "${ECHO_T}$ac_cv_type_getgroups" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
 +echo "${ECHO_T}$ac_cv_type_getgroups" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define GETGROUPS_T $ac_cv_type_getgroups
-+_ACEOF
-+
-+
-+
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define GETGROUPS_T $ac_cv_type_getgroups
+@@ -35827,8 +35995,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for char" >&5
+-echo $ECHO_N "checking for char... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for char" >&5
 +echo $ECHO_N "checking for char... $ECHO_C" >&6; }
-+if test "${ac_cv_type_char+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_type_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35839,61 +36007,57 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +typedef char ac__type_new_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-if ((char *) 0)
 +if ((ac__type_new_ *) 0)
-+  return 0;
+   return 0;
+-if (sizeof (char))
 +if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -52249,58 +37617,84 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_type_char=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_type_char=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_char=no
 +	ac_cv_type_char=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_type_char" >&5
+-echo "${ECHO_T}$ac_cv_type_char" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
 +echo "${ECHO_T}$ac_cv_type_char" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking size of char" >&5
+-echo $ECHO_N "checking size of char... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of char" >&5
 +echo $ECHO_N "checking size of char... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_char+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_sizeof_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_char" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -35903,10 +36067,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef char ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -35914,27 +36079,22 @@
+ }
+ _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;;
@@ -52308,36 +37702,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -35944,10 +36104,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef char ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -35955,56 +36116,53 @@
+ }
+ _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;;
@@ -52345,53 +37754,78 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef char ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36012,27 +36170,22 @@
+ }
+ _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;;
@@ -52399,36 +37833,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -36042,10 +36195,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef char ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36053,50 +36207,48 @@
+ }
+ _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;;
@@ -52436,63 +37885,87 @@
 +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
+   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
 +  (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
-+
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
 +	ac_lo= ac_hi=
-+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
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# 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`
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ # 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`
+@@ -36107,10 +36259,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef char ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36118,52 +36271,45 @@
+ }
+ _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;;
@@ -52500,78 +37973,116 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_char=$ac_lo;;
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_char=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
 +'') if test "$ac_cv_type_char" = yes; then
 +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-+See \`config.log' for more details." >&5
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char), 77
 +echo "$as_me: error: cannot compute sizeof (char)
-+See \`config.log' for more details." >&2;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
 +   else
 +     ac_cv_sizeof_char=0
 +   fi ;;
-+esac
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ 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.  */
+ _ACEOF
+@@ -36171,8 +36317,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_;
 +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
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -36181,35 +36328,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (char))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (char))))
+-	exit (1);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (char))))
+-	exit (1);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
 +  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -52579,74 +38090,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_sizeof_char=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36220,29 +36376,32 @@
+ 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" = yes; then
 +     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-+See \`config.log' for more details." >&5
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char), 77
 +echo "$as_me: error: cannot compute sizeof (char)
-+See \`config.log' for more details." >&2;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-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=0
 +   fi
-+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
-+fi
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_char=0
+ fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_char" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_char" >&6; }
 +
 +
 +
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_CHAR $ac_cv_sizeof_char
-+_ACEOF
-+
-+
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_CHAR $ac_cv_sizeof_char
+ _ACEOF
+ 
+ 
+-echo "$as_me:$LINENO: checking for short" >&5
+-echo $ECHO_N "checking for short... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for short" >&5
 +echo $ECHO_N "checking for short... $ECHO_C" >&6; }
-+if test "${ac_cv_type_short+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_type_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36253,61 +36412,57 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +typedef short ac__type_new_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-if ((short *) 0)
 +if ((ac__type_new_ *) 0)
-+  return 0;
+   return 0;
+-if (sizeof (short))
 +if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -52654,58 +38177,84 @@
 +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
+   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
 +  (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
-+
+   ac_cv_type_short=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_short=no
 +	ac_cv_type_short=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_type_short" >&5
+-echo "${ECHO_T}$ac_cv_type_short" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
 +echo "${ECHO_T}$ac_cv_type_short" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking size of short" >&5
+-echo $ECHO_N "checking size of short... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of short" >&5
 +echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_short+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_sizeof_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_short" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -36317,10 +36472,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef short ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36328,27 +36484,22 @@
+ }
+ _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;;
@@ -52713,36 +38262,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -36358,10 +36509,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef short ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36369,56 +36521,53 @@
+ }
+ _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;;
@@ -52750,53 +38314,78 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef short ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36426,27 +36575,22 @@
+ }
+ _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;;
@@ -52804,36 +38393,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -36456,10 +36600,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef short ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36467,50 +36612,48 @@
+ }
+ _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;;
@@ -52841,63 +38445,87 @@
 +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
+   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
 +  (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
-+
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
 +	ac_lo= ac_hi=
-+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
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# 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`
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ # 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`
+@@ -36521,10 +36664,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef short ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36532,52 +36676,45 @@
+ }
+ _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;;
@@ -52905,78 +38533,116 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_short=$ac_lo;;
+ done
+ case $ac_lo in
+ ?*) 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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
 +   else
 +     ac_cv_sizeof_short=0
 +   fi ;;
-+esac
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ 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.  */
+ _ACEOF
+@@ -36585,8 +36722,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_;
 +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
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -36595,35 +36733,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (short))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
 +  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -52984,74 +38650,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_sizeof_short=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36634,29 +36781,32 @@
+ 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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-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
-+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
-+fi
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_short=0
+-fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
 +
 +
 +
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SHORT $ac_cv_sizeof_short
-+_ACEOF
-+
-+
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
+ 
+ 
+-echo "$as_me:$LINENO: checking for int" >&5
+-echo $ECHO_N "checking for int... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for int" >&5
 +echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-+if test "${ac_cv_type_int+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_type_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36667,61 +36817,57 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +typedef int ac__type_new_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-if ((int *) 0)
 +if ((ac__type_new_ *) 0)
-+  return 0;
+   return 0;
+-if (sizeof (int))
 +if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -53059,58 +38737,84 @@
 +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
+   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
 +  (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
-+
+   ac_cv_type_int=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_int=no
 +	ac_cv_type_int=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_type_int" >&5
+-echo "${ECHO_T}$ac_cv_type_int" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
 +echo "${ECHO_T}$ac_cv_type_int" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking size of int" >&5
+-echo $ECHO_N "checking size of int... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of int" >&5
 +echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_int+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_sizeof_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_int" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -36731,10 +36877,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef int ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36742,27 +36889,22 @@
+ }
+ _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;;
@@ -53118,36 +38822,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -36772,10 +36914,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef int ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36783,56 +36926,53 @@
+ }
+ _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;;
@@ -53155,53 +38874,78 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef int ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36840,27 +36980,22 @@
+ }
+ _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;;
@@ -53209,36 +38953,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -36870,10 +37005,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef int ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36881,50 +37017,48 @@
+ }
+ _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;;
@@ -53246,63 +39005,87 @@
 +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
+   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
 +  (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
-+
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
 +	ac_lo= ac_hi=
-+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
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# 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`
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ # 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`
+@@ -36935,10 +37069,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef int ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -36946,52 +37081,45 @@
+ }
+ _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;;
@@ -53310,78 +39093,116 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_int=$ac_lo;;
+ done
+ case $ac_lo in
+ ?*) 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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
 +   else
 +     ac_cv_sizeof_int=0
 +   fi ;;
-+esac
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ 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.  */
+ _ACEOF
+@@ -36999,8 +37127,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_;
 +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
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -37009,35 +37138,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (int))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
 +  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -53389,74 +39210,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_sizeof_int=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37048,29 +37186,32 @@
+ 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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-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
-+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
-+fi
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_int=0
+ 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
 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
 +
 +
 +
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_INT $ac_cv_sizeof_int
-+_ACEOF
-+
-+
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+ 
+ 
+-echo "$as_me:$LINENO: checking for long" >&5
+-echo $ECHO_N "checking for long... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for long" >&5
 +echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-+if test "${ac_cv_type_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_type_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37081,61 +37222,57 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +typedef long ac__type_new_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-if ((long *) 0)
 +if ((ac__type_new_ *) 0)
-+  return 0;
+   return 0;
+-if (sizeof (long))
 +if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -53464,58 +39297,84 @@
 +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
+   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
 +  (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
-+
+   ac_cv_type_long=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_long=no
 +	ac_cv_type_long=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_type_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
 +echo "${ECHO_T}$ac_cv_type_long" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of long" >&5
 +echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ if test "${ac_cv_sizeof_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -37145,10 +37282,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -37156,27 +37294,22 @@
+ }
+ _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;;
@@ -53523,36 +39382,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -37186,10 +37319,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -37197,56 +37331,53 @@
+ }
+ _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;;
@@ -53560,53 +39434,78 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -37254,27 +37385,22 @@
+ }
+ _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;;
@@ -53614,36 +39513,51 @@
 +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
+   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
 +  (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -37284,10 +37410,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -37295,50 +37422,48 @@
+ }
+ _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;;
@@ -53651,63 +39565,87 @@
 +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
+   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
 +  (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
-+
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
 +	ac_lo= ac_hi=
-+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
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# 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`
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ # 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`
+@@ -37349,10 +37474,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 +   typedef long ac__type_sizeof_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ test_array [0] = 0
+ 
+   ;
+@@ -37360,52 +37486,45 @@
+ }
+ _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;;
@@ -53715,78 +39653,116 @@
 +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
+   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
 +  (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
-+
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_long=$ac_lo;;
+ done
+ case $ac_lo in
+ ?*) 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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
 +   else
 +     ac_cv_sizeof_long=0
 +   fi ;;
-+esac
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
+ 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.  */
+ _ACEOF
+@@ -37413,8 +37532,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_;
 +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
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -37423,35 +37543,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (long))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 +	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
 +  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -53794,77 +39770,81 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_sizeof_long=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37462,29 +37591,32 @@
+ 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)
-+See \`config.log' for more details." >&5
+ 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;}
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-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
-+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
-+fi
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_long=0
+-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
 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
 +
 +
 +
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_LONG $ac_cv_sizeof_long
-+_ACEOF
-+
-+
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+ 
+ 
+-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
-+if test "${ac_cv_c_bigendian+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # See if sys/param.h defines the BYTE_ORDER macro.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <sys/param.h>
-+
-+int
-+main ()
-+{
+ if test "${ac_cv_c_bigendian+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37501,7 +37633,8 @@
+ int
+ main ()
+ {
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
 +#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
 +	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-+ bogus endian macros
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+  bogus endian macros
+ #endif
+ 
+@@ -37510,27 +37643,22 @@
+ }
+ _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;;
@@ -53872,37 +39852,38 @@
 +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
+   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
 +  (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.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <sys/param.h>
-+
-+int
-+main ()
-+{
-+#if BYTE_ORDER != BIG_ENDIAN
-+ not big endian
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -37553,40 +37681,36 @@
+ }
+ _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;;
@@ -53910,53 +39891,71 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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
 +  (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
-+
+   ac_cv_c_bigendian=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_c_bigendian=no
 +	ac_cv_c_bigendian=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+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
+ 
+-# It does not; compile a test program.
 +	# It does not; compile a test program.
-+if test "$cross_compiling" = yes; then
-+  # try to guess the endianness by grepping values into an object file
-+  ac_cv_c_bigendian=unknown
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
+ if test "$cross_compiling" = yes; then
+   # try to guess the endianness by grepping values into an object file
+   ac_cv_c_bigendian=unknown
+@@ -37596,11 +37720,11 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
 +short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+ void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 +short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
 +short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-+int
-+main ()
-+{
-+ _ascii (); _ebcdic ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+ int
+ main ()
+@@ -37611,27 +37735,22 @@
+ }
+ _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;;
@@ -53964,60 +39963,72 @@
 +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
+   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
 +  (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
-+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+  if test "$ac_cv_c_bigendian" = unknown; then
-+    ac_cv_c_bigendian=no
-+  else
-+    # finding both strings is unlikely to happen, but who knows?
-+    ac_cv_c_bigendian=unknown
-+  fi
-+fi
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+   ac_cv_c_bigendian=yes
+ fi
+@@ -37647,8 +37766,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -37656,27 +37777,41 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 +$ac_includes_default
-+int
-+main ()
-+{
+ int
+ main ()
+ {
 +
-+  /* Are we little or big endian?  From Harbison&Steele.  */
-+  union
-+  {
+   /* Are we little or big endian?  From Harbison&Steele.  */
+   union
+   {
+-    long l;
+-    char c[sizeof (long)];
 +    long int l;
 +    char c[sizeof (long int)];
-+  } u;
-+  u.l = 1;
+   } u;
+   u.l = 1;
+-  exit (u.c[sizeof (long) - 1] == 1);
 +  return u.c[sizeof (long int) - 1] == 1;
 +
 +  ;
 +  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -54025,129 +40036,94 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_c_bigendian=no
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_c_bigendian=yes
-+fi
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37689,13 +37824,16 @@
+ ( exit $ac_status )
+ ac_cv_c_bigendian=yes
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
 +
 +
-+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_c_bigendian" >&5
+-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-+case $ac_cv_c_bigendian in
-+  yes)
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define WORDS_BIGENDIAN 1
-+_ACEOF
-+ ;;
-+  no)
-+     ;;
-+  *)
-+    { { echo "$as_me:$LINENO: error: unknown endianness
-+presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-+echo "$as_me: error: unknown endianness
-+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-+   { (exit 1); exit 1; }; } ;;
-+esac
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_func in socket powl sqrtl strdup getdtablesize setpgid nice seteuid vsyslog initgroups setgroups getgroups grantpt pw_encrypt setpriority getpt unlockpt ptsname waitpid getpassphrase
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ case $ac_cv_c_bigendian in
+   yes)
+ 
+@@ -37737,9 +37875,9 @@
+ for ac_func in socket powl sqrtl strdup getdtablesize setpgid nice seteuid vsyslog initgroups setgroups getgroups grantpt pw_encrypt setpriority getpt unlockpt ptsname waitpid getpassphrase
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -37765,68 +37903,60 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -54155,84 +40131,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -37837,15 +37967,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for mkstemps" >&5
+-echo $ECHO_N "checking for mkstemps... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for mkstemps" >&5
 +echo $ECHO_N "checking for mkstemps... $ECHO_C" >&6; }
-+if test "${kde_cv_func_mkstemps+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_mkstemps+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+
-+
-+int
-+main ()
-+{
-+
-+
-+mkstemps("/tmp/aaaXXXXXX", 6);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -37857,9 +37986,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37885,35 +38011,31 @@
+ }
+ _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;;
@@ -54240,99 +40218,75 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  kde_cv_func_mkstemps=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   kde_cv_func_mkstemps=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_mkstemps=no
 +	kde_cv_func_mkstemps=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -37926,11 +38048,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_mkstemps" >&5
+-echo "${ECHO_T}$kde_cv_func_mkstemps" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_mkstemps" >&5
 +echo "${ECHO_T}$kde_cv_func_mkstemps" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking if mkstemps needs custom prototype" >&5
+-echo $ECHO_N "checking if mkstemps needs custom prototype... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if mkstemps needs custom prototype" >&5
 +echo $ECHO_N "checking if mkstemps needs custom prototype... $ECHO_C" >&6; }
-+if test "${kde_cv_proto_mkstemps+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_mkstemps" = xyes; then
-+  kde_cv_proto_mkstemps=no
-+else
-+  case "mkstemps" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_mkstemps="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_mkstemps=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_mkstemps" = xunknown; then
-+
-+
+ if test "${kde_cv_proto_mkstemps+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37951,8 +38073,7 @@
+ if test "x$kde_cv_proto_mkstemps" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+
-+
-+extern "C" int mkstemps(char *, int);
-+
-+int
-+main ()
-+{
-+
-+
-+mkstemps("/tmp/aaaXXXXXX", 6);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -37990,37 +38111,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -54340,105 +40294,92 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_mkstemps=yes
-+  kde_cv_proto_mkstemps=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+    kde_cv_func_mkstemps=yes
+   kde_cv_proto_mkstemps=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_mkstemps="mkstemps unavailable"
 +	kde_cv_proto_mkstemps="mkstemps unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -38033,8 +38151,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemps" >&5
+-echo "${ECHO_T}$kde_cv_proto_mkstemps" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemps" >&5
 +echo "${ECHO_T}$kde_cv_proto_mkstemps" >&6; }
-+
-+if test "x$kde_cv_func_mkstemps" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_MKSTEMPS 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_mkstemps" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_MKSTEMPS_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
+ 
+ if test "x$kde_cv_func_mkstemps" = xyes; then
+ 
+@@ -38058,15 +38176,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for setenv" >&5
+-echo $ECHO_N "checking for setenv... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for setenv" >&5
 +echo $ECHO_N "checking for setenv... $ECHO_C" >&6; }
-+if test "${kde_cv_func_setenv+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_setenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+
-+
-+int
-+main ()
-+{
-+
-+setenv("VAR", "VALUE", 1);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -38078,9 +38195,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38103,35 +38217,31 @@
+ }
+ _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;;
@@ -54446,96 +40387,75 @@
 +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
+   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_cxx_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_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
-+
+   kde_cv_func_setenv=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_setenv=no
 +	kde_cv_func_setenv=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -38144,11 +38254,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5
+-echo "${ECHO_T}$kde_cv_func_setenv" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5
 +echo "${ECHO_T}$kde_cv_func_setenv" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5
+-echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5
 +echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6; }
-+if test "${kde_cv_proto_setenv+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_setenv" = xyes; then
-+  kde_cv_proto_setenv=no
-+else
-+  case "setenv" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_setenv="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_setenv=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_setenv" = xunknown; then
-+
-+
+ if test "${kde_cv_proto_setenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38169,8 +38279,7 @@
+ if test "x$kde_cv_proto_setenv" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+
-+
-+extern "C" int setenv (const char *, const char *, int);
-+
-+int
-+main ()
-+{
-+
-+setenv("VAR", "VALUE", 1);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -38205,37 +38314,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -54543,105 +40463,92 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
-+
+    kde_cv_func_setenv=yes
+   kde_cv_proto_setenv=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_setenv="setenv unavailable"
 +	kde_cv_proto_setenv="setenv unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -38248,8 +38354,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5
+-echo "${ECHO_T}$kde_cv_proto_setenv" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5
 +echo "${ECHO_T}$kde_cv_proto_setenv" >&6; }
-+
-+if test "x$kde_cv_func_setenv" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_SETENV 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_setenv" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_SETENV_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
+ 
+ if test "x$kde_cv_func_setenv" = xyes; then
+ 
+@@ -38273,15 +38379,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for unsetenv" >&5
+-echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for unsetenv" >&5
 +echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6; }
-+if test "${kde_cv_func_unsetenv+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_unsetenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+
-+
-+int
-+main ()
-+{
-+
-+unsetenv("VAR");
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -38293,9 +38398,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38318,35 +38420,31 @@
+ }
+ _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;;
@@ -54649,96 +40556,75 @@
 +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
+   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_cxx_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_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
-+
+   kde_cv_func_unsetenv=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_unsetenv=no
 +	kde_cv_func_unsetenv=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -38359,11 +38457,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5
+-echo "${ECHO_T}$kde_cv_func_unsetenv" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5
 +echo "${ECHO_T}$kde_cv_func_unsetenv" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5
+-echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5
 +echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6; }
-+if test "${kde_cv_proto_unsetenv+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_unsetenv" = xyes; then
-+  kde_cv_proto_unsetenv=no
-+else
-+  case "unsetenv" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_unsetenv="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_unsetenv=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_unsetenv" = xunknown; then
-+
-+
+ if test "${kde_cv_proto_unsetenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38384,8 +38482,7 @@
+ if test "x$kde_cv_proto_unsetenv" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+
-+
-+extern "C" void unsetenv (const char *);
-+
-+int
-+main ()
-+{
-+
-+unsetenv("VAR");
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -38420,37 +38517,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -54746,110 +40632,92 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
-+
+    kde_cv_func_unsetenv=yes
+   kde_cv_proto_unsetenv=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_unsetenv="unsetenv unavailable"
 +	kde_cv_proto_unsetenv="unsetenv unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -38463,8 +38557,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5
+-echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5
 +echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6; }
-+
-+if test "x$kde_cv_func_unsetenv" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_UNSETENV 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_unsetenv" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_UNSETENV_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
+ 
+ if test "x$kde_cv_func_unsetenv" = xyes; then
+ 
+@@ -38488,15 +38582,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for getdomainname" >&5
+-echo $ECHO_N "checking for getdomainname... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for getdomainname" >&5
 +echo $ECHO_N "checking for getdomainname... $ECHO_C" >&6; }
-+if test "${kde_cv_func_getdomainname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_getdomainname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netdb.h>
-+
-+
-+int
-+main ()
-+{
-+
-+
-+char buffer[200];
-+getdomainname(buffer, 200);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -38508,9 +38601,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38538,35 +38628,31 @@
+ }
+ _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;;
@@ -54857,102 +40725,75 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  kde_cv_func_getdomainname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   kde_cv_func_getdomainname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_getdomainname=no
 +	kde_cv_func_getdomainname=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -38579,11 +38665,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_getdomainname" >&5
+-echo "${ECHO_T}$kde_cv_func_getdomainname" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_getdomainname" >&5
 +echo "${ECHO_T}$kde_cv_func_getdomainname" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking if getdomainname needs custom prototype" >&5
+-echo $ECHO_N "checking if getdomainname needs custom prototype... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if getdomainname needs custom prototype" >&5
 +echo $ECHO_N "checking if getdomainname needs custom prototype... $ECHO_C" >&6; }
-+if test "${kde_cv_proto_getdomainname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_getdomainname" = xyes; then
-+  kde_cv_proto_getdomainname=no
-+else
-+  case "getdomainname" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_getdomainname="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_getdomainname=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_getdomainname" = xunknown; then
-+
-+
+ if test "${kde_cv_proto_getdomainname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38604,8 +38690,7 @@
+ if test "x$kde_cv_proto_getdomainname" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netdb.h>
-+
-+
-+extern "C" #include <sys/types.h>
-+		int getdomainname (char *, size_t);
-+
-+int
-+main ()
-+{
-+
-+
-+char buffer[200];
-+getdomainname(buffer, 200);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -38646,37 +38731,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -54960,109 +40801,92 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_getdomainname=yes
-+  kde_cv_proto_getdomainname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+    kde_cv_func_getdomainname=yes
+   kde_cv_proto_getdomainname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_getdomainname="getdomainname unavailable"
 +	kde_cv_proto_getdomainname="getdomainname unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -38689,8 +38771,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_getdomainname" >&5
+-echo "${ECHO_T}$kde_cv_proto_getdomainname" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_getdomainname" >&5
 +echo "${ECHO_T}$kde_cv_proto_getdomainname" >&6; }
-+
-+if test "x$kde_cv_func_getdomainname" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GETDOMAINNAME 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_getdomainname" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GETDOMAINNAME_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
+ 
+ if test "x$kde_cv_func_getdomainname" = xyes; then
+ 
+@@ -38714,15 +38796,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for gethostname" >&5
+-echo $ECHO_N "checking for gethostname... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for gethostname" >&5
 +echo $ECHO_N "checking for gethostname... $ECHO_C" >&6; }
-+if test "${kde_cv_func_gethostname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_gethostname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+
-+
-+int
-+main ()
-+{
-+
-+
-+char buffer[200];
-+gethostname(buffer, 200);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -38734,9 +38815,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38763,35 +38841,31 @@
+ }
+ _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;;
@@ -55070,100 +40894,75 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  kde_cv_func_gethostname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   kde_cv_func_gethostname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_gethostname=no
 +	kde_cv_func_gethostname=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -38804,11 +38878,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_gethostname" >&5
+-echo "${ECHO_T}$kde_cv_func_gethostname" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_gethostname" >&5
 +echo "${ECHO_T}$kde_cv_func_gethostname" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking if gethostname needs custom prototype" >&5
+-echo $ECHO_N "checking if gethostname needs custom prototype... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if gethostname needs custom prototype" >&5
 +echo $ECHO_N "checking if gethostname needs custom prototype... $ECHO_C" >&6; }
-+if test "${kde_cv_proto_gethostname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_gethostname" = xyes; then
-+  kde_cv_proto_gethostname=no
-+else
-+  case "gethostname" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_gethostname="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_gethostname=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_gethostname" = xunknown; then
-+
-+
+ if test "${kde_cv_proto_gethostname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38829,8 +38903,7 @@
+ if test "x$kde_cv_proto_gethostname" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+
-+
-+extern "C" int gethostname (char *, unsigned int);
-+
-+int
-+main ()
-+{
-+
-+
-+char buffer[200];
-+gethostname(buffer, 200);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -38869,37 +38942,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -55171,107 +40970,92 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_gethostname=yes
-+  kde_cv_proto_gethostname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+    kde_cv_func_gethostname=yes
+   kde_cv_proto_gethostname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_gethostname="gethostname unavailable"
 +	kde_cv_proto_gethostname="gethostname unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -38912,8 +38982,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_gethostname" >&5
+-echo "${ECHO_T}$kde_cv_proto_gethostname" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_gethostname" >&5
 +echo "${ECHO_T}$kde_cv_proto_gethostname" >&6; }
-+
-+if test "x$kde_cv_func_gethostname" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GETHOSTNAME 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_gethostname" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GETHOSTNAME_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
+ 
+ if test "x$kde_cv_func_gethostname" = xyes; then
+ 
+@@ -38937,15 +39007,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for usleep" >&5
+-echo $ECHO_N "checking for usleep... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for usleep" >&5
 +echo $ECHO_N "checking for usleep... $ECHO_C" >&6; }
-+if test "${kde_cv_func_usleep+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_usleep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <unistd.h>
-+
-+
-+int
-+main ()
-+{
-+
-+
-+usleep(200);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -38957,9 +39026,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38984,35 +39050,31 @@
+ }
+ _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;;
@@ -55279,98 +41063,75 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  kde_cv_func_usleep=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   kde_cv_func_usleep=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_usleep=no
 +	kde_cv_func_usleep=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -39025,11 +39087,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5
+-echo "${ECHO_T}$kde_cv_func_usleep" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5
 +echo "${ECHO_T}$kde_cv_func_usleep" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5
+-echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5
 +echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6; }
-+if test "${kde_cv_proto_usleep+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_usleep" = xyes; then
-+  kde_cv_proto_usleep=no
-+else
-+  case "usleep" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_usleep="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_usleep=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_usleep" = xunknown; then
-+
-+
+ if test "${kde_cv_proto_usleep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39050,8 +39112,7 @@
+ if test "x$kde_cv_proto_usleep" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <unistd.h>
-+
-+
-+extern "C" int usleep (unsigned int);
-+
-+int
-+main ()
-+{
-+
-+
-+usleep(200);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -39088,37 +39149,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -55378,107 +41139,92 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_usleep=yes
-+  kde_cv_proto_usleep=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+    kde_cv_func_usleep=yes
+   kde_cv_proto_usleep=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_usleep="usleep unavailable"
 +	kde_cv_proto_usleep="usleep unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -39131,8 +39189,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5
+-echo "${ECHO_T}$kde_cv_proto_usleep" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5
 +echo "${ECHO_T}$kde_cv_proto_usleep" >&6; }
-+
-+if test "x$kde_cv_func_usleep" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_USLEEP 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_usleep" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_USLEEP_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
+ 
+ if test "x$kde_cv_func_usleep" = xyes; then
+ 
+@@ -39156,15 +39214,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for random" >&5
+-echo $ECHO_N "checking for random... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for random" >&5
 +echo $ECHO_N "checking for random... $ECHO_C" >&6; }
-+if test "${kde_cv_func_random+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_random+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+
-+
-+int
-+main ()
-+{
-+
-+
-+random();
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -39176,9 +39233,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39203,35 +39257,31 @@
+ }
+ _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;;
@@ -55486,98 +41232,75 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  kde_cv_func_random=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   kde_cv_func_random=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_random=no
 +	kde_cv_func_random=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -39244,11 +39294,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_random" >&5
+-echo "${ECHO_T}$kde_cv_func_random" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_random" >&5
 +echo "${ECHO_T}$kde_cv_func_random" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking if random needs custom prototype" >&5
+-echo $ECHO_N "checking if random needs custom prototype... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if random needs custom prototype" >&5
 +echo $ECHO_N "checking if random needs custom prototype... $ECHO_C" >&6; }
-+if test "${kde_cv_proto_random+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_random" = xyes; then
-+  kde_cv_proto_random=no
-+else
-+  case "random" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_random="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_random=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_random" = xunknown; then
-+
-+
+ if test "${kde_cv_proto_random+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39269,8 +39319,7 @@
+ if test "x$kde_cv_proto_random" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+
-+
-+extern "C" long int random(void);
-+
-+int
-+main ()
-+{
-+
-+
-+random();
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -39307,37 +39356,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -55585,106 +41308,92 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_random=yes
-+  kde_cv_proto_random=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+    kde_cv_func_random=yes
+   kde_cv_proto_random=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_random="random unavailable"
 +	kde_cv_proto_random="random unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -39350,8 +39396,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_random" >&5
+-echo "${ECHO_T}$kde_cv_proto_random" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_random" >&5
 +echo "${ECHO_T}$kde_cv_proto_random" >&6; }
-+
-+if test "x$kde_cv_func_random" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_RANDOM 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_random" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_RANDOM_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
+ 
+ if test "x$kde_cv_func_random" = xyes; then
+ 
+@@ -39374,15 +39420,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for srandom" >&5
+-echo $ECHO_N "checking for srandom... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for srandom" >&5
 +echo $ECHO_N "checking for srandom... $ECHO_C" >&6; }
-+if test "${kde_cv_func_srandom+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_srandom+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+
-+
-+int
-+main ()
-+{
-+
-+
-+srandom(27);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -39394,9 +39439,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39421,35 +39463,31 @@
+ }
+ _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;;
@@ -55692,98 +41401,75 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  kde_cv_func_srandom=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   kde_cv_func_srandom=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_srandom=no
 +	kde_cv_func_srandom=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -39462,11 +39500,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_srandom" >&5
+-echo "${ECHO_T}$kde_cv_func_srandom" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_srandom" >&5
 +echo "${ECHO_T}$kde_cv_func_srandom" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking if srandom needs custom prototype" >&5
+-echo $ECHO_N "checking if srandom needs custom prototype... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if srandom needs custom prototype" >&5
 +echo $ECHO_N "checking if srandom needs custom prototype... $ECHO_C" >&6; }
-+if test "${kde_cv_proto_srandom+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_srandom" = xyes; then
-+  kde_cv_proto_srandom=no
-+else
-+  case "srandom" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_srandom="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_srandom=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_srandom" = xunknown; then
-+
-+
+ if test "${kde_cv_proto_srandom+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39487,8 +39525,7 @@
+ if test "x$kde_cv_proto_srandom" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <stdlib.h>
-+
-+
-+extern "C" void srandom(unsigned int);
-+
-+int
-+main ()
-+{
-+
-+
-+srandom(27);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -39525,37 +39562,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -55791,91 +41477,74 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_srandom=yes
-+  kde_cv_proto_srandom=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+    kde_cv_func_srandom=yes
+   kde_cv_proto_srandom=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_srandom="srandom unavailable"
 +	kde_cv_proto_srandom="srandom unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -39568,8 +39602,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_srandom" >&5
+-echo "${ECHO_T}$kde_cv_proto_srandom" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_srandom" >&5
 +echo "${ECHO_T}$kde_cv_proto_srandom" >&6; }
-+
-+if test "x$kde_cv_func_srandom" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_SRANDOM 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_srandom" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_SRANDOM_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
+ 
+ if test "x$kde_cv_func_srandom" = xyes; then
+ 
+@@ -39593,8 +39627,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for S_ISSOCK" >&5
+-echo $ECHO_N "checking for S_ISSOCK... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for S_ISSOCK" >&5
 +echo $ECHO_N "checking for S_ISSOCK... $ECHO_C" >&6; }
-+if test "${ac_cv_have_s_issock+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <sys/stat.h>
-+
-+int
-+main ()
-+{
-+
-+struct stat buff;
-+int b = S_ISSOCK( buff.st_mode );
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ if test "${ac_cv_have_s_issock+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39620,41 +39654,38 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -55883,186 +41552,157 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_s_issock=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_have_s_issock=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_s_issock=no
 +	ac_cv_have_s_issock=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $ac_cv_have_s_issock" >&5
+-echo "${ECHO_T}$ac_cv_have_s_issock" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_have_s_issock" >&5
 +echo "${ECHO_T}$ac_cv_have_s_issock" >&6; }
-+if test "$ac_cv_have_s_issock" = "yes"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_S_ISSOCK 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
+ if test "$ac_cv_have_s_issock" = "yes"; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -39668,8 +39699,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5
+-echo $ECHO_N "checking for MAXPATHLEN... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5
 +echo $ECHO_N "checking for MAXPATHLEN... $ECHO_C" >&6; }
-+if test "${ac_cv_maxpathlen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cat > conftest.$ac_ext <<EOF
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+#include <stdio.h>
-+#include <sys/param.h>
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 1024
-+#endif
-+
-+KDE_HELLO MAXPATHLEN
-+
-+EOF
-+
-+ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
-+
-+if { (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); } && test -s conftest.out; then
-+    ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
-+else
-+    ac_cv_maxpathlen=1024
-+fi
-+
-+rm conftest.*
-+
-+
-+fi
-+
+ if test "${ac_cv_maxpathlen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39705,16 +39736,16 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $ac_cv_maxpathlen" >&5
+-echo "${ECHO_T}$ac_cv_maxpathlen" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_maxpathlen" >&5
 +echo "${ECHO_T}$ac_cv_maxpathlen" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define KDEMAXPATHLEN $ac_cv_maxpathlen
-+_ACEOF
-+
-+
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define KDEMAXPATHLEN $ac_cv_maxpathlen
+ _ACEOF
+ 
+ 
+-echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5
+-echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5
 +echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6; }
-+
-+case "$host_os" in
-+linux*) utmp_support=yes;
-+     ;;
-+freebsd*) utmp_support=yes;
-+     ;;
-+kfreebsd*-gnu) utmp_support=yes;
-+     ;;
-+*) utmp_support=no;
-+esac
-+
+ 
+ case "$host_os" in
+ linux*) utmp_support=yes;
+@@ -39726,8 +39757,8 @@
+ *) utmp_support=no;
+ esac
+ 
+-echo "$as_me:$LINENO: result: $utmp_support" >&5
+-echo "${ECHO_T}$utmp_support" >&6
 +{ echo "$as_me:$LINENO: result: $utmp_support" >&5
 +echo "${ECHO_T}$utmp_support" >&6; }
-+
-+if test "$utmp_support" = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define UTMP_SUPPORT 1
-+_ACEOF
-+
-+fi
-+
-+
+ 
+ if test "$utmp_support" = yes; then
+ 
+@@ -39738,8 +39769,8 @@
+ fi
+ 
+ 
+-    echo "$as_me:$LINENO: checking for utmp file" >&5
+-echo $ECHO_N "checking for utmp file... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for utmp file" >&5
 +echo $ECHO_N "checking for utmp file... $ECHO_C" >&6; }
-+
-+    if test "${kde_cv_utmp_file+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    kde_cv_utmp_file=no
-+
-+    for ac_file in    \
-+                      \
-+	/var/run/utmp \
-+	/var/adm/utmp \
-+	/etc/utmp     \
-+     ; \
-+    do
-+     if test -r "$ac_file"; then
-+       kde_cv_utmp_file=$ac_file
-+       break
-+     fi
-+    done
-+
-+fi
-+
-+
-+    if test "$kde_cv_utmp_file" != "no"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define UTMP "$kde_cv_utmp_file"
-+_ACEOF
-+
-+
+ 
+     if test "${kde_cv_utmp_file+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -39770,18 +39801,18 @@
+ _ACEOF
+ 
+ 
+-	echo "$as_me:$LINENO: result: $kde_cv_utmp_file" >&5
+-echo "${ECHO_T}$kde_cv_utmp_file" >&6
 +	{ echo "$as_me:$LINENO: result: $kde_cv_utmp_file" >&5
 +echo "${ECHO_T}$kde_cv_utmp_file" >&6; }
-+    else
-+
+     else
+ 
+-	echo "$as_me:$LINENO: result: non found" >&5
+-echo "${ECHO_T}non found" >&6
 +	{ echo "$as_me:$LINENO: result: non found" >&5
 +echo "${ECHO_T}non found" >&6; }
-+    fi
-+
-+
-+kde_have_kstat=yes
+     fi
+ 
+ 
+ kde_have_kstat=yes
+-echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5
+-echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5
 +echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lkstat  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39794,56 +39825,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char kstat_open ();
-+int
-+main ()
-+{
+ #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 kstat_open ();
+ int
+ main ()
+ {
+-kstat_open ();
 +return kstat_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -56070,67 +41710,81 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_kstat_kstat_open=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_kstat_kstat_open=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_kstat_kstat_open=no
 +	ac_cv_lib_kstat_kstat_open=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5
+-echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5
 +echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6; }
-+if test $ac_cv_lib_kstat_kstat_open = yes; then
-+  LIBKSTAT=-lkstat
-+else
-+  kde_have_kstat=no
-+fi
-+
-+
-+if test "$kde_have_kstat" = "yes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_KSTAT 1
-+_ACEOF
-+
-+fi
-+
-+if test "${ac_cv_header_libdevinfo_h+set}" = set; then
+ if test $ac_cv_lib_kstat_kstat_open = yes; then
+   LIBKSTAT=-lkstat
+ else
+@@ -39860,17 +39888,17 @@
+ fi
+ 
+ if test "${ac_cv_header_libdevinfo_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for libdevinfo.h" >&5
+-echo $ECHO_N "checking for libdevinfo.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for libdevinfo.h" >&5
 +echo $ECHO_N "checking for libdevinfo.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libdevinfo_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_libdevinfo_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libdevinfo_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libdevinfo_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libdevinfo_h" >&5
 +echo "${ECHO_T}$ac_cv_header_libdevinfo_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking libdevinfo.h usability" >&5
+-echo $ECHO_N "checking libdevinfo.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking libdevinfo.h usability" >&5
 +echo $ECHO_N "checking libdevinfo.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <libdevinfo.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39881,41 +39909,37 @@
+ #include <libdevinfo.h>
+ _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;;
@@ -56138,38 +41792,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking libdevinfo.h presence" >&5
+-echo $ECHO_N "checking libdevinfo.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking libdevinfo.h presence" >&5
 +echo $ECHO_N "checking libdevinfo.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <libdevinfo.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39924,24 +39948,22 @@
+ /* end confdefs.h.  */
+ #include <libdevinfo.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -56177,102 +41852,110 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -39949,9 +39971,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -39975,25 +39998,18 @@
+ echo "$as_me: WARNING: libdevinfo.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: libdevinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libdevinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libdevinfo.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libdevinfo.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: libdevinfo.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: libdevinfo.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libdevinfo.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libdevinfo.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libdevinfo.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: libdevinfo.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libdevinfo.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: libdevinfo.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libdevinfo.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libdevinfo.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for libdevinfo.h" >&5
+-echo $ECHO_N "checking for libdevinfo.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for libdevinfo.h" >&5
 +echo $ECHO_N "checking for libdevinfo.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libdevinfo_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_libdevinfo_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_libdevinfo_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_libdevinfo_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libdevinfo_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libdevinfo_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libdevinfo_h" >&5
 +echo "${ECHO_T}$ac_cv_header_libdevinfo_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_libdevinfo_h = yes; then
-+  kde_have_libdevinfo_h=yes
-+else
-+  kde_have_libdevinfo_h=no
-+fi
-+
-+
-+if test "$kde_have_libdevinfo_h" = "yes"; then
-+   kde_have_libdevinfo_lib=yes
+ 
+ fi
+ if test $ac_cv_header_libdevinfo_h = yes; then
+@@ -40005,8 +40021,8 @@
+ 
+ if test "$kde_have_libdevinfo_h" = "yes"; then
+    kde_have_libdevinfo_lib=yes
+-   echo "$as_me:$LINENO: checking for di_init in -ldevinfo" >&5
+-echo $ECHO_N "checking for di_init in -ldevinfo... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for di_init in -ldevinfo" >&5
 +echo $ECHO_N "checking for di_init in -ldevinfo... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_devinfo_di_init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldevinfo  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_devinfo_di_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40019,56 +40035,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char di_init ();
-+int
-+main ()
-+{
+ #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 di_init ();
+ int
+ main ()
+ {
+-di_init ();
 +return di_init ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -56280,530 +41963,92 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_devinfo_di_init=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_devinfo_di_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_devinfo_di_init=no
 +	ac_cv_lib_devinfo_di_init=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_devinfo_di_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_devinfo_di_init" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_devinfo_di_init" >&5
 +echo "${ECHO_T}$ac_cv_lib_devinfo_di_init" >&6; }
-+if test $ac_cv_lib_devinfo_di_init = yes; then
-+  LIBDEVINFO=-ldevinfo
-+else
-+  kde_have_libdevinfo_lib=no
-+fi
-+
-+   if test "$kde_have_libdevinfo_lib" = "yes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBDEVINFO_H 1
-+_ACEOF
-+
-+
-+   fi
-+fi
-+
-+
-+
-+
+ if test $ac_cv_lib_devinfo_di_init = yes; then
+   LIBDEVINFO=-ldevinfo
+ else
+@@ -40088,18 +40101,18 @@
+ 
+ 
+ 
+-# Check whether --with-java or --without-java was given.
 +# Check whether --with-java was given.
-+if test "${with_java+set}" = set; then
+ if test "${with_java+set}" = set; then
+-  withval="$with_java"
+-    ac_java_dir=$withval
 +  withval=$with_java;   ac_java_dir=$withval
-+
-+else
-+  ac_java_dir=""
-+
+ 
+ else
+   ac_java_dir=""
+ 
+-fi;
 +fi
 +
-+
+ 
+-echo "$as_me:$LINENO: checking for Java" >&5
+-echo $ECHO_N "checking for Java... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for Java" >&5
 +echo $ECHO_N "checking for Java... $ECHO_C" >&6; }
-+
-+if test "x$ac_java_dir" = "xno"; then
-+   kde_java_bindir=no
-+   kde_java_includedir=no
-+   kde_java_libjvmdir=no
-+   kde_java_libgcjdir=no
-+   kde_java_libhpidir=no
-+else
-+  if test "x$ac_java_dir" = "x"; then
-+
-+
-+            if test -n "$JAVA_HOME"; then
-+
-+	dir=`dirname "$JAVA_HOME"`
-+	base=`basename "$JAVA_HOME"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+      fi
-+
-+	dir=`dirname "/usr/j2se"`
-+	base=`basename "/usr/j2se"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/usr/lib/j2se"`
-+	base=`basename "/usr/lib/j2se"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/usr/j*dk*"`
-+	base=`basename "/usr/j*dk*"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/usr/lib/j*dk*"`
-+	base=`basename "/usr/lib/j*dk*"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/opt/j*sdk*"`
-+	base=`basename "/opt/j*sdk*"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/usr/lib/java*"`
-+	base=`basename "/usr/lib/java*"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/usr/java*"`
-+	base=`basename "/usr/java*"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/usr/java/j*dk*"`
-+	base=`basename "/usr/java/j*dk*"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/usr/java/j*re*"`
-+	base=`basename "/usr/java/j*re*"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/usr/lib/SunJava2*"`
-+	base=`basename "/usr/lib/SunJava2*"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/usr/lib/SunJava*"`
-+	base=`basename "/usr/lib/SunJava*"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/usr/lib/IBMJava2*"`
-+	base=`basename "/usr/lib/IBMJava2*"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/usr/lib/IBMJava*"`
-+	base=`basename "/usr/lib/IBMJava*"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+	dir=`dirname "/opt/java*"`
-+	base=`basename "/opt/java*"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+
-+
-+      kde_cv_path="NONE"
-+      kde_save_IFS=$IFS
-+      IFS=':'
-+      for dir in $PATH; do
-+	  if test -d "$dir"; then
-+	      javadirs="$javadirs $dir"
-+	  fi
-+      done
-+      IFS=$kde_save_IFS
-+      jredirs=
-+
-+            for dir in $javadirs; do
-+          	  if test -x "$dir/java"; then
-+	      	                    if test "$dir" != "/usr/bin"; then
-+                  libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-+		  if test ! -f $libjvmdir/libjvm.so; then continue; fi
-+		  jredirs="$jredirs $dir"
-+	      fi
-+	  fi
-+      done
-+
-+            JAVAC=
-+      JAVA=
-+      kde_java_bindir=no
-+      for dir in $jredirs; do
-+	  JAVA="$dir/java"
-+	  kde_java_bindir=$dir
-+	  if test -x "$dir/javac"; then
-+		JAVAC="$dir/javac"
-+                break
-+	  fi
-+      done
-+
-+      if test -n "$JAVAC"; then
-+                    kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'`
-+      else
-+          kde_java_includedir=no
-+      fi
-+  else
-+        kde_java_bindir=$ac_java_dir/bin
-+    if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then
-+	kde_java_includedir=no
-+    else
-+        kde_java_includedir=$ac_java_dir/include
-+    fi
-+  fi
-+fi
-+
-+if test "x$kde_java_bindir" != "xno"; then
-+
-+    kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-+    kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
-+    kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
-+
-+      if test -d "$kde_java_includedir"; then
-+    if test ! -x "$kde_java_bindir/javac"; then
-+      { { echo "$as_me:$LINENO: error: javac not found under $kde_java_bindir - it seems you passed a wrong --with-java." >&5
-+echo "$as_me: error: javac not found under $kde_java_bindir - it seems you passed a wrong --with-java." >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+    if test ! -x "$kde_java_bindir/javah"; then
-+      { { echo "$as_me:$LINENO: error: javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java." >&5
-+echo "$as_me: error: javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java." >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+    if test ! -x "$kde_java_bindir/jar"; then
-+      { { echo "$as_me:$LINENO: error: jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java." >&5
-+echo "$as_me: error: jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java." >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+    if test ! -r "$kde_java_includedir/jni.h"; then
-+      { { echo "$as_me:$LINENO: error: jni.h not found under $kde_java_includedir. Use --with-java or --without-java." >&5
-+echo "$as_me: error: jni.h not found under $kde_java_includedir. Use --with-java or --without-java." >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+
-+    jni_includes="-I$kde_java_includedir"
-+
-+
-+    if test "x$kde_java_libgcjdir" = "x"; then
-+      test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux"
-+      test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris"
-+      test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix"
-+    fi
-+
-+  else
-+    JAVAC=
-+    jni_includes=
-+  fi
-+
-+  if test "x$kde_java_libgcjdir" = "x"; then
-+     if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
-+        { { echo "$as_me:$LINENO: error: libjvm.so not found under $kde_java_libjvmdir. Use --without-java." >&5
-+echo "$as_me: error: libjvm.so not found under $kde_java_libjvmdir. Use --without-java." >&2;}
-+   { (exit 1); exit 1; }; }
-+     fi
-+  else
-+     if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
-+        { { echo "$as_me:$LINENO: error: libgcj.so not found under $kde_java_libgcjdir. Use --without-java." >&5
-+echo "$as_me: error: libgcj.so not found under $kde_java_libgcjdir. Use --without-java." >&2;}
-+   { (exit 1); exit 1; }; }
-+     fi
-+  fi
-+
-+  if test ! -x "$kde_java_bindir/java"; then
-+      { { echo "$as_me:$LINENO: error: java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java." >&5
-+echo "$as_me: error: java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java." >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+
-+
-+  if test "x$kde_java_libgcjdir" = "x"; then
-+      if test ! -r "$kde_java_libhpidir/libhpi.so"; then
-+        { { echo "$as_me:$LINENO: error: libhpi.so not found under $kde_java_libhpidir. Use --without-java." >&5
-+echo "$as_me: error: libhpi.so not found under $kde_java_libhpidir. Use --without-java." >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+  fi
-+
-+  if test -n "$jni_includes"; then
-+
+ 
+ if test "x$ac_java_dir" = "xno"; then
+    kde_java_bindir=no
+@@ -40535,8 +40548,7 @@
+ 
+   if test -n "$jni_includes"; then
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    ac_cxxflags_safe="$CXXFLAGS"
-+    CXXFLAGS="$CXXFLAGS $all_includes $jni_includes"
-+
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+  #include <jni.h>
-+
-+int
-+main ()
-+{
-+
-+  #ifndef JNI_VERSION_1_2
-+  Syntax Error
-+  #endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -40570,35 +40582,31 @@
+ }
+ _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;;
@@ -56811,289 +42056,254 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+   kde_jni_works=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+    kde_jni_works=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+- kde_jni_works=no
 +	 kde_jni_works=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+    if test $kde_jni_works = no; then
-+      { { echo "$as_me:$LINENO: error: Incorrect version of $kde_java_includedir/jni.h.
-+		    You need to have Java Development Kit (JDK) version 1.2.
-+
-+		    Use --with-java to specify another location.
-+		    Use --without-java to configure without java support.
-+		    Or download a newer JDK and try again.
-+		    See e.g. http://java.sun.com/products/jdk/1.2 " >&5
-+echo "$as_me: error: Incorrect version of $kde_java_includedir/jni.h.
-+		    You need to have Java Development Kit (JDK) version 1.2.
-+
-+		    Use --with-java to specify another location.
-+		    Use --without-java to configure without java support.
-+		    Or download a newer JDK and try again.
-+		    See e.g. http://java.sun.com/products/jdk/1.2 " >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+
-+    CXXFLAGS="$ac_cxxflags_safe"
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+    JAVAC=$kde_java_bindir/javac
-+    JAVAH=$kde_java_bindir/javah
-+    JAR=$kde_java_bindir/jar
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PATH_JAVA "$kde_java_bindir/java"
-+_ACEOF
-+
-+    if test "x$kde_java_libgcjdir" = "x"; then
-+      JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
-+    else
-+      JVMLIBS="-L$kde_java_libgcjdir -lgcj"
-+    fi
+ 
+     if test $kde_jni_works = no; then
+       { { echo "$as_me:$LINENO: error: Incorrect version of $kde_java_includedir/jni.h.
+@@ -40640,8 +40648,8 @@
+     else
+       JVMLIBS="-L$kde_java_libgcjdir -lgcj"
+     fi
+-    echo "$as_me:$LINENO: result: java JDK in $kde_java_bindir" >&5
+-echo "${ECHO_T}java JDK in $kde_java_bindir" >&6
 +    { echo "$as_me:$LINENO: result: java JDK in $kde_java_bindir" >&5
 +echo "${ECHO_T}java JDK in $kde_java_bindir" >&6; }
-+
-+  else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PATH_JAVA "$kde_java_bindir/java"
-+_ACEOF
-+
+ 
+   else
+ 
+@@ -40649,8 +40657,8 @@
+ #define PATH_JAVA "$kde_java_bindir/java"
+ _ACEOF
+ 
+-      echo "$as_me:$LINENO: result: java JRE in $kde_java_bindir" >&5
+-echo "${ECHO_T}java JRE in $kde_java_bindir" >&6
 +      { echo "$as_me:$LINENO: result: java JRE in $kde_java_bindir" >&5
 +echo "${ECHO_T}java JRE in $kde_java_bindir" >&6; }
-+  fi
-+elif test -d "/Library/Java/Home"; then
-+  kde_java_bindir="/Library/Java/Home/bin"
-+  jni_includes="-I/Library/Java/Home/include"
-+
-+  JAVAC=$kde_java_bindir/javac
-+  JAVAH=$kde_java_bindir/javah
-+  JAR=$kde_java_bindir/jar
-+  JVMLIBS="-Wl,-framework,JavaVM"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PATH_JAVA "$kde_java_bindir/java"
-+_ACEOF
-+
+   fi
+ elif test -d "/Library/Java/Home"; then
+   kde_java_bindir="/Library/Java/Home/bin"
+@@ -40666,11 +40674,11 @@
+ #define PATH_JAVA "$kde_java_bindir/java"
+ _ACEOF
+ 
+-  echo "$as_me:$LINENO: result: Apple Java Framework" >&5
+-echo "${ECHO_T}Apple Java Framework" >&6
 +  { echo "$as_me:$LINENO: result: Apple Java Framework" >&5
 +echo "${ECHO_T}Apple Java Framework" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: none found" >&5
+-echo "${ECHO_T}none found" >&6
 +  { echo "$as_me:$LINENO: result: none found" >&5
 +echo "${ECHO_T}none found" >&6; }
-+fi
-+
-+
-+
-+
-+
-+
-+
-+# for backward compat
-+kde_cv_java_includedir=$kde_java_includedir
-+kde_cv_java_bindir=$kde_java_bindir
-+
-+
-+MD5SUM_CUT="-f 1"
-+for ac_prog in md5sum gmd5sum
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
+ fi
+ 
+ 
+@@ -40689,8 +40697,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_MD5SUM+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $MD5SUM in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_MD5SUM="$MD5SUM" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_path_MD5SUM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40705,35 +40713,36 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+     ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+MD5SUM=$ac_cv_path_MD5SUM
-+if test -n "$MD5SUM"; then
+ 
+   ;;
+ esac
+ fi
+ MD5SUM=$ac_cv_path_MD5SUM
+-
+ if test -n "$MD5SUM"; then
+-  echo "$as_me:$LINENO: result: $MD5SUM" >&5
+-echo "${ECHO_T}$MD5SUM" >&6
 +  { echo "$as_me:$LINENO: result: $MD5SUM" >&5
 +echo "${ECHO_T}$MD5SUM" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+  test -n "$MD5SUM" && break
-+done
-+
-+if test -z "$MD5SUM" ; then
-+  # Extract the first word of "md5", so it can be a program name with args.
-+set dummy md5; ac_word=$2
+   test -n "$MD5SUM" && break
+ done
+ 
+ if test -z "$MD5SUM" ; then
+   # Extract the first word of "md5", so it can be a program name with args.
+ set dummy md5; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_MD5SUM+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $MD5SUM in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_MD5SUM="$MD5SUM" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_path_MD5SUM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40748,32 +40757,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+     ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+MD5SUM=$ac_cv_path_MD5SUM
-+if test -n "$MD5SUM"; then
+ 
+   ;;
+ esac
+ fi
+ MD5SUM=$ac_cv_path_MD5SUM
+-
+ if test -n "$MD5SUM"; then
+-  echo "$as_me:$LINENO: result: $MD5SUM" >&5
+-echo "${ECHO_T}$MD5SUM" >&6
 +  { echo "$as_me:$LINENO: result: $MD5SUM" >&5
 +echo "${ECHO_T}$MD5SUM" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+  if test -z "$MD5SUM" ; then
-+    # Extract the first word of "md5", so it can be a program name with args.
-+set dummy md5; ac_word=$2
+   if test -z "$MD5SUM" ; then
+     # Extract the first word of "md5", so it can be a program name with args.
+ set dummy md5; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_MD5SUM+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $MD5SUM in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_MD5SUM="$MD5SUM" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /sbin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_path_MD5SUM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40788,27 +40798,28 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+     ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+MD5SUM=$ac_cv_path_MD5SUM
-+if test -n "$MD5SUM"; then
+ 
+   ;;
+ esac
+ fi
+ MD5SUM=$ac_cv_path_MD5SUM
+-
+ if test -n "$MD5SUM"; then
+-  echo "$as_me:$LINENO: result: $MD5SUM" >&5
+-echo "${ECHO_T}$MD5SUM" >&6
 +  { echo "$as_me:$LINENO: result: $MD5SUM" >&5
 +echo "${ECHO_T}$MD5SUM" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+  fi
-+  if test -z "$MD5SUM" ; then
-+    { echo "$as_me:$LINENO: WARNING: No md5sum, gmd5sum, or md5 was found. The fish IOSlave cannot be compiled." >&5
-+echo "$as_me: WARNING: No md5sum, gmd5sum, or md5 was found. The fish IOSlave cannot be compiled." >&2;}
-+    # Will fail anyway, but in a better way than a blank command.
-+    MD5SUM="md5sum"
-+    MD5SUM_CUT="-f 1"
-+  else
-+    MD5SUM_CUT="-f 4"
-+  fi
-+fi
-+
-+
-+ac_save_ldflags="$LDFLAGS"
-+LDFLAGS="$X_LDFLAGS"
-+
-+XTESTLIB=
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+   fi
+   if test -z "$MD5SUM" ; then
+     { echo "$as_me:$LINENO: WARNING: No md5sum, gmd5sum, or md5 was found. The fish IOSlave cannot be compiled." >&5
+@@ -40830,8 +40841,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+   if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
+ 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'
+@@ -40841,17 +40851,17 @@
+ 
+ 
+    if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
 +echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/extensions/XTest.h usability" >&5
+-echo $ECHO_N "checking X11/extensions/XTest.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X11/extensions/XTest.h usability" >&5
 +echo $ECHO_N "checking X11/extensions/XTest.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <X11/extensions/XTest.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -40862,41 +40872,37 @@
+ #include <X11/extensions/XTest.h>
+ _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;;
@@ -57101,38 +42311,59 @@
 +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
+   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_cxx_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_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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking X11/extensions/XTest.h presence" >&5
+-echo $ECHO_N "checking X11/extensions/XTest.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X11/extensions/XTest.h presence" >&5
 +echo $ECHO_N "checking X11/extensions/XTest.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/extensions/XTest.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -40905,24 +40911,22 @@
+ /* end confdefs.h.  */
+ #include <X11/extensions/XTest.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -57140,94 +42371,106 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -40930,9 +40934,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -40956,30 +40961,23 @@
+ echo "$as_me: WARNING: X11/extensions/XTest.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: X11/extensions/XTest.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: X11/extensions/XTest.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: X11/extensions/XTest.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: X11/extensions/XTest.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: X11/extensions/XTest.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: X11/extensions/XTest.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: X11/extensions/XTest.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
 +echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_X11_extensions_XTest_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_extensions_XTest_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_X11_extensions_XTest_h = yes; then
+ 
+ fi
+ if test $ac_cv_header_X11_extensions_XTest_h = yes; then
+-  echo "$as_me:$LINENO: checking for XTestFakeKeyEvent in -lXtst" >&5
+-echo $ECHO_N "checking for XTestFakeKeyEvent in -lXtst... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for XTestFakeKeyEvent in -lXtst" >&5
 +echo $ECHO_N "checking for XTestFakeKeyEvent in -lXtst... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXtst  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40992,56 +40990,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XTestFakeKeyEvent ();
-+int
-+main ()
-+{
+ #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 XTestFakeKeyEvent ();
+ int
+ main ()
+ {
+-XTestFakeKeyEvent ();
 +return XTestFakeKeyEvent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -57235,82 +42478,78 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_Xtst_XTestFakeKeyEvent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xtst_XTestFakeKeyEvent=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xtst_XTestFakeKeyEvent=no
 +	ac_cv_lib_Xtst_XTestFakeKeyEvent=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xtst_XTestFakeKeyEvent" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xtst_XTestFakeKeyEvent" >&6; }
-+if test $ac_cv_lib_Xtst_XTestFakeKeyEvent = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_XTEST 1
-+_ACEOF
-+
-+	 XTESTLIB=-lXtst
-+fi
-+
-+
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ if test $ac_cv_lib_Xtst_XTestFakeKeyEvent = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -41069,8 +41064,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
+ 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'
+@@ -41079,8 +41073,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
+-echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
 +echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+
-+#include <X11/XKBlib.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41095,41 +41089,37 @@
+ #include <X11/XKBlib.h>
+ _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;;
@@ -57318,58 +42557,79 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_X11_XKBlib_h=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_header_X11_XKBlib_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_XKBlib_h=no
 +	ac_cv_header_X11_XKBlib_h=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_header_X11_XKBlib_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6; }
-+if test $ac_cv_header_X11_XKBlib_h = yes; then
+ if test $ac_cv_header_X11_XKBlib_h = yes; then
+-  echo "$as_me:$LINENO: checking for XkbLockModifiers in -lX11" >&5
+-echo $ECHO_N "checking for XkbLockModifiers in -lX11... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for XkbLockModifiers in -lX11" >&5
 +echo $ECHO_N "checking for XkbLockModifiers in -lX11... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_X11_XkbLockModifiers+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lX11  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_X11_XkbLockModifiers+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41142,56 +41132,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XkbLockModifiers ();
-+int
-+main ()
-+{
+ #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 XkbLockModifiers ();
+ int
+ main ()
+ {
+-XkbLockModifiers ();
 +return XkbLockModifiers ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -57377,68 +42637,88 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_X11_XkbLockModifiers=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_X11_XkbLockModifiers=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_X11_XkbLockModifiers=no
 +	ac_cv_lib_X11_XkbLockModifiers=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbLockModifiers" >&5
+-echo "${ECHO_T}$ac_cv_lib_X11_XkbLockModifiers" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbLockModifiers" >&5
 +echo "${ECHO_T}$ac_cv_lib_X11_XkbLockModifiers" >&6; }
-+if test $ac_cv_lib_X11_XkbLockModifiers = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_XKB 1
-+_ACEOF
-+
-+fi
-+
+ if test $ac_cv_lib_X11_XkbLockModifiers = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -41200,8 +41187,8 @@
+ 
+ fi
+ 
+-     echo "$as_me:$LINENO: checking for XkbSetPerClientControls in -lX11" >&5
+-echo $ECHO_N "checking for XkbSetPerClientControls in -lX11... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for XkbSetPerClientControls in -lX11" >&5
 +echo $ECHO_N "checking for XkbSetPerClientControls in -lX11... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_X11_XkbSetPerClientControls+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lX11  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_X11_XkbSetPerClientControls+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41214,56 +41201,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XkbSetPerClientControls ();
-+int
-+main ()
-+{
+ #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 XkbSetPerClientControls ();
+ int
+ main ()
+ {
+-XkbSetPerClientControls ();
 +return XkbSetPerClientControls ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -57446,86 +42726,82 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_X11_XkbSetPerClientControls=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_X11_XkbSetPerClientControls=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_X11_XkbSetPerClientControls=no
 +	ac_cv_lib_X11_XkbSetPerClientControls=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbSetPerClientControls" >&5
+-echo "${ECHO_T}$ac_cv_lib_X11_XkbSetPerClientControls" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbSetPerClientControls" >&5
 +echo "${ECHO_T}$ac_cv_lib_X11_XkbSetPerClientControls" >&6; }
-+if test $ac_cv_lib_X11_XkbSetPerClientControls = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_XKBSETPERCLIENTCONTROLS 1
-+_ACEOF
-+
-+fi
-+
-+
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+
-+
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
+ if test $ac_cv_lib_X11_XkbSetPerClientControls = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -41289,10 +41273,9 @@
+ 
+ 
+ 
+-
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+
-+for ac_header in X11/Xcursor/Xcursor.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 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'
+@@ -41305,9 +41288,9 @@
+ for ac_header in X11/Xcursor/Xcursor.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -41321,38 +41304,35 @@
+ #include <$ac_header>
+ _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;;
@@ -57533,71 +42809,86 @@
 +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
+   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_cxx_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_cxx_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=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
+ 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: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +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_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -41366,8 +41346,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XcursorSupportsARGB in -lXcursor" >&5
+-echo $ECHO_N "checking for XcursorSupportsARGB in -lXcursor... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for XcursorSupportsARGB in -lXcursor" >&5
 +echo $ECHO_N "checking for XcursorSupportsARGB in -lXcursor... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xcursor_XcursorSupportsARGB+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXcursor $X_PRE_LIBS -lX11 $X_EXTRA_LIBS  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_Xcursor_XcursorSupportsARGB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41380,56 +41360,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XcursorSupportsARGB ();
-+int
-+main ()
-+{
+ #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 XcursorSupportsARGB ();
+ int
+ main ()
+ {
+-XcursorSupportsARGB ();
 +return XcursorSupportsARGB ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -57605,106 +42896,91 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_Xcursor_XcursorSupportsARGB=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xcursor_XcursorSupportsARGB=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xcursor_XcursorSupportsARGB=no
 +	ac_cv_lib_Xcursor_XcursorSupportsARGB=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xcursor_XcursorSupportsARGB" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xcursor_XcursorSupportsARGB" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xcursor_XcursorSupportsARGB" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xcursor_XcursorSupportsARGB" >&6; }
-+if test $ac_cv_lib_Xcursor_XcursorSupportsARGB = yes; then
-+  LIB_XCURSOR=-lXcursor
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_XCURSOR 1
-+_ACEOF
-+
-+
-+else
-+  LIB_XCURSOR=
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+else
-+   LIB_XCURSOR=
-+fi
-+
-+done
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+
-+if test "$LIB_XCURSOR" = -lXcursor; then
-+  have_xcursor_TRUE=
-+  have_xcursor_FALSE='#'
-+else
-+  have_xcursor_TRUE='#'
-+  have_xcursor_FALSE=
-+fi
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ if test $ac_cv_lib_Xcursor_XcursorSupportsARGB = yes; then
+   LIB_XCURSOR=-lXcursor
+ 
+@@ -41475,8 +41452,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+   if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+ 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'
+@@ -41486,17 +41462,17 @@
+ 
+ 
+    if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
 +echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
+-echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
 +echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <X11/extensions/Xrender.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41507,41 +41483,37 @@
+ #include <X11/extensions/Xrender.h>
+ _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;;
@@ -57712,38 +42988,59 @@
 +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
+   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_cxx_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_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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5
+-echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5
 +echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/extensions/Xrender.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41550,24 +41522,22 @@
+ /* end confdefs.h.  */
+ #include <X11/extensions/Xrender.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -57751,118 +43048,111 @@
 +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
+   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; 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
 +  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
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -41575,9 +41545,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -41601,25 +41572,18 @@
+ echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: X11/extensions/Xrender.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: X11/extensions/Xrender.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
 +echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
-+  xrender_h=yes
-+else
-+  xrender_h=no
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+if test "$xrender_h" = yes; then
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
+ 
+ fi
+ if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
+@@ -41647,8 +41611,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XRenderComposite in -lXrender" >&5
+-echo $ECHO_N "checking for XRenderComposite in -lXrender... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for XRenderComposite in -lXrender" >&5
 +echo $ECHO_N "checking for XRenderComposite in -lXrender... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXrender -lXext -lX11 $X_EXTRA_LIBS $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41661,56 +41625,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XRenderComposite ();
-+int
-+main ()
-+{
+ #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 XRenderComposite ();
+ int
+ main ()
+ {
+-XRenderComposite ();
 +return XRenderComposite ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -57870,411 +43160,229 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_Xrender_XRenderComposite=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xrender_XRenderComposite=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xrender_XRenderComposite=no
 +	ac_cv_lib_Xrender_XRenderComposite=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderComposite" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderComposite" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderComposite" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderComposite" >&6; }
-+if test $ac_cv_lib_Xrender_XRenderComposite = yes; then
-+  LIB_XRENDER=-lXrender
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_XRENDER 1
-+_ACEOF
-+
-+
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+else
-+  LIB_XRENDER=
-+fi
-+
-+
-+LDFLAGS="$ac_save_ldflags"
-+
-+
-+CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
-+
-+
+ if test $ac_cv_lib_Xrender_XRenderComposite = yes; then
+   LIB_XRENDER=-lXrender
+ 
+@@ -41735,8 +41696,8 @@
+ CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+ 
+ 
+-echo "$as_me:$LINENO: checking for Qt docs" >&5
+-echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for Qt docs" >&5
 +echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; }
-+kde_qtdir=
-+if test "${with_qt_dir+set}" = set; then
-+  kde_qtdir="$with_qt_dir"
-+fi
-+
-+
-+QTDOCDIR=NO
-+for i in  $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ;
-+do
-+  for j in qsql.html;
-+  do
+ kde_qtdir=
+ if test "${with_qt_dir+set}" = set; then
+   kde_qtdir="$with_qt_dir"
+@@ -41748,7 +41709,7 @@
+ do
+   for j in qsql.html;
+   do
+-    echo "configure: 41751: $i/$j" >&5
 +    echo "configure: 41712: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      QTDOCDIR=$i
-+      break 2
-+    fi
-+  done
-+done
-+
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       QTDOCDIR=$i
+@@ -41757,20 +41718,20 @@
+   done
+ done
+ 
+-echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
+-echo "${ECHO_T}$QTDOCDIR" >&6
 +{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
 +echo "${ECHO_T}$QTDOCDIR" >&6; }
-+
-+
-+
-+
+ 
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dot" >&5
+-echo $ECHO_N "checking for dot... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for dot" >&5
 +echo $ECHO_N "checking for dot... $ECHO_C" >&6; }
-+   if test -n "$DOT"; then
-+        kde_cv_path="$DOT";
-+   else
-+        kde_cache=`echo dot | sed 'y%./+-%__p_%'`
-+
+    if test -n "$DOT"; then
+         kde_cv_path="$DOT";
+    else
+         kde_cache=`echo dot | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs=" $dirs"
-+        else  	  dirs="$dirs "
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/dot"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/dot  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/dot"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/dot"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -41813,12 +41774,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+   else
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      DOT=$kde_cv_path
-+
-+   fi
-+
-+if test -n "$DOT"; then
-+  KDE_HAVE_DOT="YES"
-+else
-+  KDE_HAVE_DOT="NO"
-+fi
-+
-+
+       DOT=$kde_cv_path
+ 
+    fi
+@@ -41830,14 +41791,14 @@
+ fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for doxygen" >&5
+-echo $ECHO_N "checking for doxygen... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for doxygen" >&5
 +echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; }
-+   if test -n "$DOXYGEN"; then
-+        kde_cv_path="$DOXYGEN";
-+   else
-+        kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
-+
+    if test -n "$DOXYGEN"; then
+         kde_cv_path="$DOXYGEN";
+    else
+         kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs=" $dirs"
-+        else  	  dirs="$dirs "
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/doxygen"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/doxygen  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/doxygen"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/doxygen"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -41880,12 +41841,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+   else
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      DOXYGEN=$kde_cv_path
-+
-+   fi
-+
-+
-+
-+DOXYGEN_PROJECT_NAME="KDE base API Reference"
-+DOXYGEN_PROJECT_NUMBER="Version $VERSION"
-+
-+
-+
-+KDE_HAS_DOXYGEN=no
-+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
-+  KDE_HAS_DOXYGEN=yes
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+savex=$exec_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+tmp=$kde_confdir
-+while KDE_CONFDIR=`eval echo "$tmp"`; test "x$KDE_CONFDIR" != "x$tmp"; do tmp=$KDE_CONFDIR; done
-+exec_prefix=$savex
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define KDE_CONFDIR "$KDE_CONFDIR"
-+_ACEOF
-+
-+
-+savex=$exec_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+tmp=$kde_datadir
-+while KDE_DATADIR=`eval echo "$tmp"`; test "x$KDE_DATADIR" != "x$tmp"; do tmp=$KDE_DATADIR; done
-+exec_prefix=$savex
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define KDE_DATADIR "$KDE_DATADIR"
-+_ACEOF
-+
-+
-+savex=$exec_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+tmp=$kde_bindir
-+while KDE_BINDIR=`eval echo "$tmp"`; test "x$KDE_BINDIR" != "x$tmp"; do tmp=$KDE_BINDIR; done
-+exec_prefix=$savex
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define KDE_BINDIR "$KDE_BINDIR"
-+_ACEOF
-+
-+
-+
-+
+       DOXYGEN=$kde_cv_path
+ 
+    fi
+@@ -41951,14 +41912,14 @@
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for libart2-config" >&5
+-echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for libart2-config" >&5
 +echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6; }
-+   if test -n "$LIBART_CONFIG"; then
-+        kde_cv_path="$LIBART_CONFIG";
-+   else
-+        kde_cache=`echo libart2-config | sed 'y%./+-%__p_%'`
-+
+    if test -n "$LIBART_CONFIG"; then
+         kde_cv_path="$LIBART_CONFIG";
+    else
+         kde_cache=`echo libart2-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+        else  	  dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/libart2-config"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/libart2-config  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/libart2-config"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/libart2-config"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -42001,15 +41962,15 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+  { echo "$as_me:$LINENO: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&5
-+echo "$as_me: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&2;}
-+
-+   else
+ 
+   { echo "$as_me:$LINENO: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&5
+ echo "$as_me: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&2;}
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      LIBART_CONFIG=$kde_cv_path
-+
-+   fi
-+
-+
-+if test -n "$LIBART_CONFIG"; then
-+  vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+  if test -n "$vers" && test "$vers" -ge 2003008
-+  then
-+     LIBART_LIBS="`$LIBART_CONFIG --libs`"
-+     LIBART_RPATH=
-+     for args in $LIBART_LIBS; do
-+	  case $args in
-+	    -L*)
-+  	       LIBART_RPATH="$LIBART_RPATH $args"
-+ 	       ;;
-+          esac
-+     done
-+     LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
-+     LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBART 1
-+_ACEOF
-+
-+  else
-+     { echo "$as_me:$LINENO: WARNING: You need at least libart 2.3.8" >&5
-+echo "$as_me: WARNING: You need at least libart 2.3.8" >&2;}
-+  fi
-+fi
-+
-+
-+
-+
-+
-+
-+
+       LIBART_CONFIG=$kde_cv_path
+ 
+    fi
+@@ -42048,11 +42009,11 @@
+ 
+ 
+ 
+-# Check whether --with-composite or --without-composite was given.
 +# Check whether --with-composite was given.
-+if test "${with_composite+set}" = set; then
+ if test "${with_composite+set}" = set; then
+-  withval="$with_composite"
 +  withval=$with_composite;
 +fi
-+
-+
-+
-+if test -z "$RUN_KAPPFINDER"; then
-+  RUN_KAPPFINDER="no"
-+fi
-+
-+
-+ACCESS_SUBDIR=
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ 
+-fi;
+ 
+ 
+ if test -z "$RUN_KAPPFINDER"; then
+@@ -42065,8 +42026,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
+ 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'
+@@ -42075,8 +42035,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
 +echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <X11/Xlib.h>
-+
-+
-+#include <X11/extensions/XKBstr.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42093,38 +42053,34 @@
+ #include <X11/extensions/XKBstr.h>
+ _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;;
@@ -58282,88 +43390,88 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_X11_extensions_XKBstr_h=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_header_X11_extensions_XKBstr_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_XKBstr_h=no
 +	ac_cv_header_X11_extensions_XKBstr_h=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_header_X11_extensions_XKBstr_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6; }
-+if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
-+  ACCESS_SUBDIR=access
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+
-+
-+
-+if test -n "$ACCESS_SUBDIR"; then
-+  include_kcontrol_access_TRUE=
-+  include_kcontrol_access_FALSE='#'
-+else
-+  include_kcontrol_access_TRUE='#'
-+  include_kcontrol_access_FALSE=
-+fi
-+
-+
-+ACCESSIBILITY_SUBDIR=
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
+   ACCESS_SUBDIR=access
+ fi
+@@ -42155,8 +42111,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+   if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
+ 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'
+@@ -42166,17 +42121,17 @@
+ 
+ 
+    if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
 +echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/extensions/XKBstr.h usability" >&5
+-echo $ECHO_N "checking X11/extensions/XKBstr.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X11/extensions/XKBstr.h usability" >&5
 +echo $ECHO_N "checking X11/extensions/XKBstr.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <X11/extensions/XKBstr.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -42187,41 +42142,37 @@
+ #include <X11/extensions/XKBstr.h>
+ _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;;
@@ -58371,38 +43479,59 @@
 +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
+   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_cxx_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_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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking X11/extensions/XKBstr.h presence" >&5
+-echo $ECHO_N "checking X11/extensions/XKBstr.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X11/extensions/XKBstr.h presence" >&5
 +echo $ECHO_N "checking X11/extensions/XKBstr.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/extensions/XKBstr.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -42230,24 +42181,22 @@
+ /* end confdefs.h.  */
+ #include <X11/extensions/XKBstr.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -58410,176 +43539,125 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -42255,9 +42204,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -42281,25 +42231,18 @@
+ echo "$as_me: WARNING: X11/extensions/XKBstr.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: X11/extensions/XKBstr.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: X11/extensions/XKBstr.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: X11/extensions/XKBstr.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: X11/extensions/XKBstr.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: X11/extensions/XKBstr.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: X11/extensions/XKBstr.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: X11/extensions/XKBstr.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
 +echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_X11_extensions_XKBstr_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_extensions_XKBstr_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
-+  ACCESSIBILITY_SUBDIR=accessibility
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+
-+
-+if test -n "$ACCESSIBILITY_SUBDIR"; then
-+  include_kcontrol_accessibility_TRUE=
-+  include_kcontrol_accessibility_FALSE='#'
-+else
-+  include_kcontrol_accessibility_TRUE='#'
-+  include_kcontrol_accessibility_FALSE=
-+fi
-+
-+
-+
-+LIBSSL="-lssl -lcrypto"
-+
-+
-+ac_ssl_includes=NO ac_ssl_libraries=NO
-+ssl_libraries=""
-+ssl_includes=""
-+
+ 
+ fi
+ if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
+@@ -42334,26 +42277,26 @@
+ ssl_libraries=""
+ ssl_includes=""
+ 
+-# Check whether --with-ssl-dir or --without-ssl-dir was given.
 +# Check whether --with-ssl-dir was given.
-+if test "${with_ssl_dir+set}" = set; then
+ if test "${with_ssl_dir+set}" = set; then
+-  withval="$with_ssl_dir"
+-    ac_ssl_includes="$withval"/include
 +  withval=$with_ssl_dir;   ac_ssl_includes="$withval"/include
-+       ac_ssl_libraries="$withval"/lib$kdelibsuff
-+
+        ac_ssl_libraries="$withval"/lib$kdelibsuff
+ 
+-fi;
 +fi
 +
-+
-+want_ssl=yes
-+
+ 
+ want_ssl=yes
+ 
+-# Check whether --with-ssl or --without-ssl was given.
 +# Check whether --with-ssl was given.
-+if test "${with_ssl+set}" = set; then
+ if test "${with_ssl+set}" = set; then
+-  withval="$with_ssl"
+-  want_ssl=$withval
+-fi;
 +  withval=$with_ssl; want_ssl=$withval
 +fi
 +
-+
-+if test $want_ssl = yes; then
-+
+ 
+ if test $want_ssl = yes; then
+ 
+-echo "$as_me:$LINENO: checking for OpenSSL" >&5
+-echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for OpenSSL" >&5
 +echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6; }
-+
-+if test "${ac_cv_have_ssl+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  #try to guess OpenSSL locations
-+
-+  ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes"
-+  ssl_incdirs="$ac_ssl_includes $ssl_incdirs"
-+
-+ssl_incdir=NO
-+for i in $ssl_incdirs;
-+do
-+  for j in openssl/ssl.h;
-+  do
+ 
+ if test "${ac_cv_have_ssl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -42368,7 +42311,7 @@
+ do
+   for j in openssl/ssl.h;
+   do
+-    echo "configure: 42371: $i/$j" >&5
 +    echo "configure: 42314: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      ssl_incdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+  ac_ssl_includes="$ssl_incdir"
-+
-+  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
-+  if test ! "$ac_ssl_libraries" = "NO"; then
-+    ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
-+  fi
-+
-+  test=NONE
-+  ssl_libdir=NONE
-+  for dir in $ssl_libdirs; do
-+    try="ls -1 $dir/libssl*"
-+    if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
-+  done
-+
-+  ac_ssl_libraries="$ssl_libdir"
-+
-+  ac_ldflags_safe="$LDFLAGS"
-+  ac_libs_safe="$LIBS"
-+
-+  LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries"
-+  LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref"
-+
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+void RSAPrivateEncrypt(void);RSAPrivateEncrypt();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       ssl_incdir=$i
+@@ -42415,37 +42358,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -58587,47 +43665,64 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_ssl_rsaref="yes"
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_ssl_rsaref="yes"
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_ssl_rsaref="no"
 +	ac_ssl_rsaref="no"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+
-+  LDFLAGS="$ac_ldflags_safe"
-+  LIBS="$ac_libs_safe"
-+
-+  if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then
-+    have_ssl=no
-+  else
-+    have_ssl=yes;
-+  fi
-+
-+
-+fi
-+
-+
-+  eval "$ac_cv_have_ssl"
-+
+       conftest$ac_exeext conftest.$ac_ext
+ 
+   LDFLAGS="$ac_ldflags_safe"
+@@ -42463,26 +42403,26 @@
+ 
+   eval "$ac_cv_have_ssl"
+ 
+-  echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
+-echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6
 +  { echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
 +echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6; }
-+
+ 
+-  echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
+-echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
+-echo "${ECHO_T}$ac_ssl_rsaref" >&6
+-
+-  echo "$as_me:$LINENO: checking for easter eggs" >&5
+-echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: none found" >&5
+-echo "${ECHO_T}none found" >&6
 +  { echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
 +echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
@@ -58637,196 +43732,70 @@
 +echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6; }
 +  { echo "$as_me:$LINENO: result: none found" >&5
 +echo "${ECHO_T}none found" >&6; }
-+
-+else
-+  have_ssl=no
-+fi
-+
-+if test "$have_ssl" = yes; then
+ 
+ else
+   have_ssl=no
+ fi
+ 
+ if test "$have_ssl" = yes; then
+-  echo "$as_me:$LINENO: checking for OpenSSL version" >&5
+-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for OpenSSL version" >&5
 +echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; }
-+    if test "${ac_cv_ssl_version+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+    cat >conftest.$ac_ext <<EOF
-+#include <openssl/opensslv.h>
-+#include <stdio.h>
-+    int main() {
-+
-+#ifndef OPENSSL_VERSION_NUMBER
-+      printf("ssl_version=\\"error\\"\n");
-+#else
-+      if (OPENSSL_VERSION_NUMBER < 0x00906000)
-+        printf("ssl_version=\\"old\\"\n");
-+      else
-+        printf("ssl_version=\\"ok\\"\n");
-+#endif
-+     return (0);
-+    }
-+EOF
-+
-+    ac_save_CPPFLAGS=$CPPFLAGS
-+    if test "$ac_ssl_includes" != "/usr/include"; then
-+        CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes"
-+    fi
-+
-+    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+
-+      if eval `./conftest 2>&5`; then
-+        if test $ssl_version = error; then
-+          { { echo "$as_me:$LINENO: error: $ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !" >&5
-+echo "$as_me: error: $ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !" >&2;}
-+   { (exit 1); exit 1; }; }
-+        else
-+          if test $ssl_version = old; then
-+            { echo "$as_me:$LINENO: WARNING: OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled." >&5
-+echo "$as_me: WARNING: OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled." >&2;}
-+            have_ssl=no
-+          fi
-+        fi
-+        ac_cv_ssl_version="ssl_version=$ssl_version"
-+      else
-+        { { echo "$as_me:$LINENO: error: Your system couldn't run a small SSL test program.
-+        Check config.log, and if you can't figure it out, send a mail to
-+        David Faure <faure at kde.org>, attaching your config.log" >&5
-+echo "$as_me: error: Your system couldn't run a small SSL test program.
-+        Check config.log, and if you can't figure it out, send a mail to
-+        David Faure <faure at kde.org>, attaching your config.log" >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+
-+    else
-+      { { echo "$as_me:$LINENO: error: Your system couldn't link a small SSL test program.
-+      Check config.log, and if you can't figure it out, send a mail to
-+      David Faure <faure at kde.org>, attaching your config.log" >&5
-+echo "$as_me: error: Your system couldn't link a small SSL test program.
-+      Check config.log, and if you can't figure it out, send a mail to
-+      David Faure <faure at kde.org>, attaching your config.log" >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+    CPPFLAGS=$ac_save_CPPFLAGS
-+
-+
-+fi
-+
-+
-+  eval "$ac_cv_ssl_version"
+     if test "${ac_cv_ssl_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42555,8 +42495,8 @@
+ 
+ 
+   eval "$ac_cv_ssl_version"
+-  echo "$as_me:$LINENO: result: $ssl_version" >&5
+-echo "${ECHO_T}$ssl_version" >&6
 +  { echo "$as_me:$LINENO: result: $ssl_version" >&5
 +echo "${ECHO_T}$ssl_version" >&6; }
-+fi
-+
-+if test "$have_ssl" != yes; then
-+  LIBSSL="";
-+else
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_SSL 1
-+_ACEOF
-+
-+  ac_cv_have_ssl="have_ssl=yes \
-+    ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref"
-+
-+
-+  ssl_libraries="$ac_ssl_libraries"
-+  ssl_includes="$ac_ssl_includes"
-+
-+  if test "$ac_ssl_rsaref" = yes; then
-+    LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref"
-+  fi
-+
-+  if test $ssl_version = "old"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_OLD_SSL_API 1
-+_ACEOF
-+
-+  fi
-+fi
-+
-+SSL_INCLUDES=
-+
-+if test "$ssl_includes" = "/usr/include"; then
-+  if test -f /usr/kerberos/include/krb5.h; then
-+	SSL_INCLUDES="-I/usr/kerberos/include"
-+  fi
-+elif test  "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then
-+  SSL_INCLUDES="-I$ssl_includes"
-+fi
-+
-+if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then
-+ SSL_LDFLAGS=""
-+else
-+ SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+ test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS=
-+ test -z "$DPMS_INCLUDE" && DPMS_INCLUDE=
-+ DPMS_LIB=
-+
-+
+ fi
+ 
+ if test "$have_ssl" != yes; then
+@@ -42615,25 +42555,25 @@
+  DPMS_LIB=
+ 
+ 
+-# Check whether --with-dpms or --without-dpms was given.
 +# Check whether --with-dpms was given.
-+if test "${with_dpms+set}" = set; then
+ if test "${with_dpms+set}" = set; then
+-  withval="$with_dpms"
+-  dpms_test=$withval
 +  withval=$with_dpms; dpms_test=$withval
-+else
-+  dpms_test="yes"
+ else
+   dpms_test="yes"
+-fi;
 +fi
 +
-+ if test "x$dpms_test" = xno; then
-+   ac_cv_have_dpms=no
-+ else
+  if test "x$dpms_test" = xno; then
+    ac_cv_have_dpms=no
+  else
+-   echo "$as_me:$LINENO: checking for DPMS" >&5
+-echo $ECHO_N "checking for DPMS... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for DPMS" >&5
 +echo $ECHO_N "checking for DPMS... $ECHO_C" >&6; }
-+         if test "${ac_cv_have_dpms+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then
+          if test "${ac_cv_have_dpms+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +      { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+      ac_cv_have_dpms="no"
-+    else
-+      ac_save_ldflags="$LDFLAGS"
-+      ac_save_cflags="$CFLAGS"
-+      ac_save_libs="$LIBS"
-+      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries"
-+      LIBS="-lX11 -lXext $LIBSOCKET"
-+      CFLAGS="$CFLAGS $X_INCLUDES"
-+      test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+	  #include <X11/Xproto.h>
-+	  #include <X11/X.h>
-+	  #include <X11/Xlib.h>
-+	  #include <X11/extensions/dpms.h>
-+	  int foo_test_dpms()
-+	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+       ac_cv_have_dpms="no"
+     else
+       ac_save_ldflags="$LDFLAGS"
+@@ -42665,27 +42605,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -58834,45 +43803,39 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_dpms="yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+              LIBS="-lXdpms $LIBS"
-+              cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+	          #include <X11/Xproto.h>
-+        	  #include <X11/X.h>
-+        	  #include <X11/Xlib.h>
-+        	  #include <X11/extensions/dpms.h>
-+        	  int foo_test_dpms()
-+        	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ac_cv_have_dpms="yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -42715,27 +42651,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -58880,101 +43843,100 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_dpms="-lXdpms"
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+                   ac_cv_have_dpms="-lXdpms"
+ 
+@@ -42743,13 +42675,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_dpms="no"
 +	ac_cv_have_dpms="no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+      LDFLAGS="$ac_save_ldflags"
-+      CFLAGS="$ac_save_cflags"
-+      LIBS="$ac_save_libs"
-+    fi
-+
-+fi
-+
-+  if test "$ac_cv_have_dpms" = no; then
+       conftest$ac_exeext conftest.$ac_ext
+       LDFLAGS="$ac_save_ldflags"
+       CFLAGS="$ac_save_cflags"
+@@ -42759,8 +42693,8 @@
+ fi
+ 
+   if test "$ac_cv_have_dpms" = no; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +    { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+    DPMS_LDFLAGS=""
-+    DPMSINC=""
-+
-+  else
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_DPMS 1
-+_ACEOF
-+
-+    if test "$ac_cv_have_dpms" = "-lXdpms"; then
-+       DPMS_LIB="-lXdpms"
-+    fi
-+    if test "$DPMS_LDFLAGS" = ""; then
-+       DPMSLIB="$DPMS_LIB "'$(LIB_X11)'
-+    else
-+       DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)'
-+    fi
-+    if test "$DPMS_INCLUDE" = ""; then
-+       DPMSINC=""
-+    else
-+       DPMSINC="-I$DPMS_INCLUDE"
-+    fi
+     DPMS_LDFLAGS=""
+     DPMSINC=""
+ 
+@@ -42783,8 +42717,8 @@
+     else
+        DPMSINC="-I$DPMS_INCLUDE"
+     fi
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +    { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+
-+  fi
-+ fi
-+ ac_save_cflags="$CFLAGS"
-+ CFLAGS="$CFLAGS $X_INCLUDES"
-+ test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-+
-+
+ 
+   fi
+  fi
+@@ -42793,8 +42727,8 @@
+  test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
+ 
+ 
+- echo "$as_me:$LINENO: checking whether DPMSCapable is declared" >&5
+-echo $ECHO_N "checking whether DPMSCapable is declared... $ECHO_C" >&6
 + { echo "$as_me:$LINENO: checking whether DPMSCapable is declared" >&5
 +echo $ECHO_N "checking whether DPMSCapable is declared... $ECHO_C" >&6; }
-+if test "${ac_cv_have_decl_DPMSCapable+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+   #include <X11/extensions/dpms.h>
-+
-+int
-+main ()
-+{
-+#ifndef DPMSCapable
+ if test "${ac_cv_have_decl_DPMSCapable+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42811,7 +42745,7 @@
+ main ()
+ {
+ #ifndef DPMSCapable
+-  char *p = (char *) DPMSCapable;
 +  (void) DPMSCapable;
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ #endif
+ 
+   ;
+@@ -42819,38 +42753,34 @@
+ }
+ _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;;
@@ -58982,62 +43944,74 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_have_decl_DPMSCapable=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_have_decl_DPMSCapable=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_decl_DPMSCapable=no
 +	ac_cv_have_decl_DPMSCapable=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_have_decl_DPMSCapable" >&5
+-echo "${ECHO_T}$ac_cv_have_decl_DPMSCapable" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_DPMSCapable" >&5
 +echo "${ECHO_T}$ac_cv_have_decl_DPMSCapable" >&6; }
-+if test $ac_cv_have_decl_DPMSCapable = yes; then
-+  cat >>confdefs.h <<\_ACEOF
-+#define HAVE_DPMSCAPABLE_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
+ if test $ac_cv_have_decl_DPMSCapable = yes; then
+   cat >>confdefs.h <<\_ACEOF
+ #define HAVE_DPMSCAPABLE_PROTO 1
+@@ -42860,8 +42790,8 @@
+ 
+ 
+ 
+- echo "$as_me:$LINENO: checking whether DPMSInfo is declared" >&5
+-echo $ECHO_N "checking whether DPMSInfo is declared... $ECHO_C" >&6
 + { echo "$as_me:$LINENO: checking whether DPMSInfo is declared" >&5
 +echo $ECHO_N "checking whether DPMSInfo is declared... $ECHO_C" >&6; }
-+if test "${ac_cv_have_decl_DPMSInfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+   #include <X11/extensions/dpms.h>
-+
-+int
-+main ()
-+{
-+#ifndef DPMSInfo
+ if test "${ac_cv_have_decl_DPMSInfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42878,7 +42808,7 @@
+ main ()
+ {
+ #ifndef DPMSInfo
+-  char *p = (char *) DPMSInfo;
 +  (void) DPMSInfo;
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ #endif
+ 
+   ;
+@@ -42886,38 +42816,34 @@
+ }
+ _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;;
@@ -59045,254 +44019,157 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_have_decl_DPMSInfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_have_decl_DPMSInfo=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_decl_DPMSInfo=no
 +	ac_cv_have_decl_DPMSInfo=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_have_decl_DPMSInfo" >&5
+-echo "${ECHO_T}$ac_cv_have_decl_DPMSInfo" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_DPMSInfo" >&5
 +echo "${ECHO_T}$ac_cv_have_decl_DPMSInfo" >&6; }
-+if test $ac_cv_have_decl_DPMSInfo = yes; then
-+  cat >>confdefs.h <<\_ACEOF
-+#define HAVE_DPMSINFO_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+ CFLAGS="$ac_save_cflags"
-+
-+
-+
-+
-+
+ if test $ac_cv_have_decl_DPMSInfo = yes; then
+   cat >>confdefs.h <<\_ACEOF
+ #define HAVE_DPMSINFO_PROTO 1
+@@ -42931,14 +42857,14 @@
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for fontconfig-config" >&5
+-echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for fontconfig-config" >&5
 +echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6; }
-+   if test -n "$FONTCONFIG_CONFIG"; then
-+        kde_cv_path="$FONTCONFIG_CONFIG";
-+   else
-+        kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
-+
+    if test -n "$FONTCONFIG_CONFIG"; then
+         kde_cv_path="$FONTCONFIG_CONFIG";
+    else
+         kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+        else  	  dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/fontconfig-config"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/fontconfig-config  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/fontconfig-config"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/fontconfig-config"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -42981,18 +42907,18 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+
+ 
+ 
+-   echo "$as_me:$LINENO: checking for pkg-config" >&5
+-echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for pkg-config" >&5
 +echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6; }
-+   if test -n "$PKGCONFIG"; then
-+        kde_cv_path="$PKGCONFIG";
-+   else
-+        kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
-+
+    if test -n "$PKGCONFIG"; then
+         kde_cv_path="$PKGCONFIG";
+    else
+         kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+        else  	  dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/pkg-config"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/pkg-config  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/pkg-config"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/pkg-config"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -43035,23 +42961,23 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+            { echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5
-+echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;}
-+
-+   else
+ 
+             { echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5
+ echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;}
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      PKGCONFIG=$kde_cv_path
-+
-+   fi
-+
-+
-+   else
+       PKGCONFIG=$kde_cv_path
+ 
+    fi
+ 
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      FONTCONFIG_CONFIG=$kde_cv_path
-+
-+   fi
-+
-+
-+if test -n "$PKGCONFIG"; then
-+  vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+  if test -n "$vers" && test "$vers" -ge 1000000
-+  then
-+     LIBFONTCONFIG_LIBS="`$PKGCONFIG fontconfig --libs`"
-+     LIBFONTCONFIG_RPATH=
-+     for args in $LIBFONTCONFIG_LIBS; do
-+          case $args in
-+            -L*)
-+               LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+               ;;
-+          esac
-+     done
-+     LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | sed -e "s/-L/-R/g"`
-+     LIBFONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_FONTCONFIG 1
-+_ACEOF
-+
-+  fi
-+fi
-+
-+if test -n "$FONTCONFIG_CONFIG"; then
-+  vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+  if test -n "$vers" && test "$vers" -ge 1000000
-+  then
-+     LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`"
-+     LIBFONTCONFIG_RPATH=
-+     for args in $LIBFONTCONFIG_LIBS; do
-+          case $args in
-+            -L*)
-+               LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+               ;;
-+          esac
-+     done
-+     LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | sed -e "s/-L/-R/g"`
-+     LIBFONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_FONTCONFIG 1
-+_ACEOF
-+
-+  fi
-+fi
-+
-+
-+
-+
-+
-+# libmach for Tru64
-+# linux/raw.h for Linux
-+# devinfo.h, libdevinfo for the list of {IRQ,DMA,IOPORTS/MEMRANGES} for FreeBSD
-+
-+case "$host" in
-+  *-*-osf*)
+       FONTCONFIG_CONFIG=$kde_cv_path
+ 
+    fi
+@@ -43115,8 +43041,8 @@
+ 
+ case "$host" in
+   *-*-osf*)
+-    echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5
+-echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5
 +echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmach  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -43129,56 +43055,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char vm_statistics ();
-+int
-+main ()
-+{
+ #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 vm_statistics ();
+ int
+ main ()
+ {
+-vm_statistics ();
 +return vm_statistics ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -59300,63 +44177,85 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_mach_vm_statistics=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_mach_vm_statistics=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_mach_vm_statistics=no
 +	ac_cv_lib_mach_vm_statistics=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_mach_vm_statistics" >&5
+-echo "${ECHO_T}$ac_cv_lib_mach_vm_statistics" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mach_vm_statistics" >&5
 +echo "${ECHO_T}$ac_cv_lib_mach_vm_statistics" >&6; }
-+if test $ac_cv_lib_mach_vm_statistics = yes; then
-+  LIB_TRU64_MACH="-lmach"
-+fi
-+    ;;
-+  *-*-linux*)
-+
-+
-+for ac_header in linux/raw.h sys/raw.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if test $ac_cv_lib_mach_vm_statistics = yes; then
+   LIB_TRU64_MACH="-lmach"
+ fi
+@@ -43189,18 +43112,19 @@
+ for ac_header in linux/raw.h sys/raw.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -43211,41 +43135,37 @@
+ #include <$ac_header>
+ _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;;
@@ -59364,38 +44263,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -43254,24 +43174,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -59403,101 +44323,109 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -43279,9 +43197,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -43305,25 +43224,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+    ;;
-+  *-*-freebsd*)
-+
-+for ac_header in devinfo.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -43340,18 +43253,19 @@
+ for ac_header in devinfo.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -43362,41 +43276,37 @@
+ #include <$ac_header>
+ _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;;
@@ -59505,38 +44433,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -43405,24 +43315,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -59544,103 +44493,112 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -43430,9 +43338,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -43456,25 +43365,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -43486,8 +43389,8 @@
+ 
+ done
+ 
+-    echo "$as_me:$LINENO: checking for devinfo_foreach_rman in -ldevinfo" >&5
+-echo $ECHO_N "checking for devinfo_foreach_rman in -ldevinfo... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for devinfo_foreach_rman in -ldevinfo" >&5
 +echo $ECHO_N "checking for devinfo_foreach_rman in -ldevinfo... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_devinfo_devinfo_foreach_rman+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldevinfo  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_devinfo_devinfo_foreach_rman+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -43500,56 +43403,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char devinfo_foreach_rman ();
-+int
-+main ()
-+{
+ #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 devinfo_foreach_rman ();
+ int
+ main ()
+ {
+-devinfo_foreach_rman ();
 +return devinfo_foreach_rman ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -59648,100 +44606,93 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_devinfo_devinfo_foreach_rman=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_devinfo_devinfo_foreach_rman=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_devinfo_devinfo_foreach_rman=no
 +	ac_cv_lib_devinfo_devinfo_foreach_rman=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_devinfo_devinfo_foreach_rman" >&5
+-echo "${ECHO_T}$ac_cv_lib_devinfo_devinfo_foreach_rman" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_devinfo_devinfo_foreach_rman" >&5
 +echo "${ECHO_T}$ac_cv_lib_devinfo_devinfo_foreach_rman" >&6; }
-+if test $ac_cv_lib_devinfo_devinfo_foreach_rman = yes; then
-+  LIBDEVINFO="-ldevinfo"
-+fi
-+
-+    ;;
-+esac
-+
-+
-+
-+
-+ test -z "$GL_LDFLAGS" && GL_LDFLAGS=
-+ test -z "$GL_INCLUDE" && GL_INCLUDE=
-+
-+
+ if test $ac_cv_lib_devinfo_devinfo_foreach_rman = yes; then
+   LIBDEVINFO="-ldevinfo"
+ fi
+@@ -43564,28 +43464,27 @@
+  test -z "$GL_INCLUDE" && GL_INCLUDE=
+ 
+ 
+-# Check whether --with-gl or --without-gl was given.
 +# Check whether --with-gl was given.
-+if test "${with_gl+set}" = set; then
+ if test "${with_gl+set}" = set; then
+-  withval="$with_gl"
+-  gl_test=$withval
 +  withval=$with_gl; gl_test=$withval
-+else
-+  gl_test="yes"
+ else
+   gl_test="yes"
+-fi;
 +fi
 +
-+ if test "x$kde_use_qt_emb" = "xyes"; then
-+   # GL and Qt Embedded is a no-go for now.
-+   ac_cv_have_gl=no
-+ elif test "x$gl_test" = xno; then
-+   ac_cv_have_gl=no
-+ else
+  if test "x$kde_use_qt_emb" = "xyes"; then
+    # GL and Qt Embedded is a no-go for now.
+    ac_cv_have_gl=no
+  elif test "x$gl_test" = xno; then
+    ac_cv_have_gl=no
+  else
+-   echo "$as_me:$LINENO: checking for GL" >&5
+-echo $ECHO_N "checking for GL... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for GL" >&5
 +echo $ECHO_N "checking for GL... $ECHO_C" >&6; }
-+   if test "${ac_cv_have_gl+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+    if test "${ac_cv_have_gl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    ac_save_ldflags=$LDFLAGS
-+    ac_save_cxxflags=$CXXFLAGS
-+    ac_save_libs=$LIBS
-+    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
-+    LIBS="$LIBS -lGL -lGLU"
-+    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
-+    LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
-+    CXXFLAGS="$CFLAGS $X_INCLUDES"
-+    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <GL/gl.h>
-+#include <GL/glu.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -43621,35 +43520,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -59749,115 +44700,91 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_have_gl="yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_have_gl="yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_gl="no"
 +	ac_cv_have_gl="no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+    LDFLAGS=$ac_save_ldflags
-+    CXXFLAGS=$ac_save_cxxflags
-+    LIBS=$ac_save_libs
-+
-+fi
-+
-+  if test "$ac_cv_have_gl" = "no"; then
+       conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -43664,8 +43560,8 @@
+ fi
+ 
+   if test "$ac_cv_have_gl" = "no"; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +    { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+    GL_LDFLAGS=""
-+    GLINC=""
-+    have_gl=no
-+  else
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GL 1
-+_ACEOF
-+
-+    if test "$GL_LDFLAGS" = ""; then
-+       GLLIB='-lGLU -lGL $(LIB_X11)'
-+    else
-+       GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
-+    fi
-+    if test "$GL_INCLUDE" = ""; then
-+       GLINC=""
-+    else
-+       GLINC="-I$GL_INCLUDE"
-+    fi
+     GL_LDFLAGS=""
+     GLINC=""
+     have_gl=no
+@@ -43685,8 +43581,8 @@
+     else
+        GLINC="-I$GL_INCLUDE"
+     fi
+-    echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
+-echo "${ECHO_T}$ac_cv_have_gl" >&6
 +    { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
 +echo "${ECHO_T}$ac_cv_have_gl" >&6; }
-+    have_gl=yes
-+  fi
-+ fi
-+
-+
-+
-+
-+
-+if test x$have_gl = xyes; then
-+  COMPILE_GL_INFO_TRUE=
-+  COMPILE_GL_INFO_FALSE='#'
-+else
-+  COMPILE_GL_INFO_TRUE='#'
-+  COMPILE_GL_INFO_FALSE=
-+fi
-+
-+
-+
+     have_gl=yes
+   fi
+  fi
+@@ -43705,15 +43601,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for long long" >&5
+-echo $ECHO_N "checking for long long... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for long long" >&5
 +echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-+if test "${kde_cv_c_long_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_c_long_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  long long foo = 0;
-+  foo = foo+1;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -43741,35 +43636,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -59865,129 +44792,141 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_c_long_long=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   kde_cv_c_long_long=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_c_long_long=no
 +	kde_cv_c_long_long=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -43780,8 +43672,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_c_long_long" >&5
+-echo "${ECHO_T}$kde_cv_c_long_long" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_c_long_long" >&5
 +echo "${ECHO_T}$kde_cv_c_long_long" >&6; }
-+if test "$kde_cv_c_long_long" = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LONG_LONG 1
-+_ACEOF
-+
-+fi
-+
-+
-+
+ if test "$kde_cv_c_long_long" = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -43792,13 +43684,13 @@
+ 
+ 
+ 
+-# Check whether --with-libusb or --without-libusb was given.
 +# Check whether --with-libusb was given.
-+if test "${with_libusb+set}" = set; then
+ if test "${with_libusb+set}" = set; then
+-  withval="$with_libusb"
+-
 +  withval=$with_libusb;
-+else
-+  with_libusb=check
+ else
+   with_libusb=check
+-fi;
 +fi
 +
-+
-+USB_LIBS=
-+USB_CFLAGS=
-+have_libusb=no
-+if test "x$with_libusb" != xno; then
-+    # Extract the first word of "libusb-config", so it can be a program name with args.
-+set dummy libusb-config; ac_word=$2
+ 
+ USB_LIBS=
+ USB_CFLAGS=
+@@ -43806,8 +43698,8 @@
+ if test "x$with_libusb" != xno; then
+     # Extract the first word of "libusb-config", so it can be a program name with args.
+ set dummy libusb-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_LIBUSBCONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $LIBUSBCONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_LIBUSBCONFIG="$LIBUSBCONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_path_LIBUSBCONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -43822,34 +43714,35 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_LIBUSBCONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+     ac_cv_path_LIBUSBCONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_LIBUSBCONFIG" && ac_cv_path_LIBUSBCONFIG="no"
-+  ;;
-+esac
-+fi
-+LIBUSBCONFIG=$ac_cv_path_LIBUSBCONFIG
-+if test -n "$LIBUSBCONFIG"; then
+ 
+   test -z "$ac_cv_path_LIBUSBCONFIG" && ac_cv_path_LIBUSBCONFIG="no"
+   ;;
+ esac
+ fi
+ LIBUSBCONFIG=$ac_cv_path_LIBUSBCONFIG
+-
+ if test -n "$LIBUSBCONFIG"; then
+-  echo "$as_me:$LINENO: result: $LIBUSBCONFIG" >&5
+-echo "${ECHO_T}$LIBUSBCONFIG" >&6
 +  { echo "$as_me:$LINENO: result: $LIBUSBCONFIG" >&5
 +echo "${ECHO_T}$LIBUSBCONFIG" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+    if test $LIBUSBCONFIG != "no"; then
-+        USB_LIBS="$($LIBUSBCONFIG --libs)"
-+        USB_CFLAGS="$($LIBUSBCONFIG --cflags)"
-+
+     if test $LIBUSBCONFIG != "no"; then
+         USB_LIBS="$($LIBUSBCONFIG --libs)"
+         USB_CFLAGS="$($LIBUSBCONFIG --cflags)"
+ 
+-        echo "$as_me:$LINENO: checking for main in -lusb" >&5
+-echo $ECHO_N "checking for main in -lusb... $ECHO_C" >&6
 +        { echo "$as_me:$LINENO: checking for main in -lusb" >&5
 +echo $ECHO_N "checking for main in -lusb... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_usb_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lusb $USB_LIBS
-+         $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
+ if test "${ac_cv_lib_usb_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -43867,46 +43760,43 @@
+ int
+ main ()
+ {
+-main ();
 +return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -59995,390 +44934,223 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_usb_main=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_usb_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_usb_main=no
 +	ac_cv_lib_usb_main=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_usb_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_usb_main" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_usb_main" >&5
 +echo "${ECHO_T}$ac_cv_lib_usb_main" >&6; }
-+if test $ac_cv_lib_usb_main = yes; then
-+  have_libusb=yes
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBUSB 1
-+_ACEOF
-+
-+fi
-+
-+    fi
-+    if test "x$with_libusb" != xcheck && test "x$have_libusb" = xno; then
-+        { { echo "$as_me:$LINENO: error: --with-libusb was given, but test for libusb failed" >&5
-+echo "$as_me: error: --with-libusb was given, but test for libusb failed" >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+fi
-+
-+
-+
-+case "$host" in
-+  *-*-linux*)
-+	FOUND_LINUX=yes
-+	;;
-+esac
-+
-+
-+
-+if test "$FOUND_LINUX" = "yes"; then
-+  include_kcontrol_joystick_TRUE=
-+  include_kcontrol_joystick_FALSE='#'
-+else
-+  include_kcontrol_joystick_TRUE='#'
-+  include_kcontrol_joystick_FALSE=
-+fi
-+
-+
-+FONTINST_SUBDIR=""
-+FONTINST_TN=""
-+
-+# Check for FreeType...
-+KFI_FOUND_FREETYPE=0
-+
-+
+ if test $ac_cv_lib_usb_main = yes; then
+   have_libusb=yes
+ 
+@@ -43950,14 +43840,14 @@
+ KFI_FOUND_FREETYPE=0
+ 
+ 
+-   echo "$as_me:$LINENO: checking for freetype-config" >&5
+-echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for freetype-config" >&5
 +echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6; }
-+   if test -n "$FREETYPE_CONFIG"; then
-+        kde_cv_path="$FREETYPE_CONFIG";
-+   else
-+        kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
-+
+    if test -n "$FREETYPE_CONFIG"; then
+         kde_cv_path="$FREETYPE_CONFIG";
+    else
+         kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+        else  	  dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/freetype-config"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/freetype-config  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/freetype-config"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/freetype-config"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -44000,15 +43890,15 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+              { echo "$as_me:$LINENO: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&5
-+echo "$as_me: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&2;}
-+
-+   else
+ 
+               { echo "$as_me:$LINENO: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&5
+ echo "$as_me: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&2;}
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      FREETYPE_CONFIG=$kde_cv_path
-+
-+   fi
-+
-+
-+if test -n "$FREETYPE_CONFIG"; then
-+    vers=`$FREETYPE_CONFIG --version 2>/dev/null | sed -e 's/libfreetype //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+    if test -n "$vers" && test "$vers" -ge 9002003
-+    then
-+        LIBFREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
-+        LIBFREETYPE_RPATH=
-+        for args in $LIBFREETYPE_LIBS; do
-+            case $args in
-+                -L*)
-+                LIBFREETYPE_RPATH="$LIBFREETYPE_RPATH $args"
-+                ;;
-+            esac
-+        done
-+        LIBFREETYPE_RPATH=`echo $LIBFREETYPE_RPATH | sed -e "s/-L/-R/g"`
-+        LIBFREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
-+        KFI_FOUND_FREETYPE=1
-+    else
-+        { echo "$as_me:$LINENO: WARNING: You need at least FreeType 2.1.3" >&5
-+echo "$as_me: WARNING: You need at least FreeType 2.1.3" >&2;}
-+    fi
-+fi
-+
-+if test "$KFI_FOUND_FREETYPE" -eq 1; then
-+
-+
-+
-+
-+    KFI_FOUND_FONTCONFIG=0
-+    # check for fontconfig...
-+
+       FREETYPE_CONFIG=$kde_cv_path
+ 
+    fi
+@@ -44044,14 +43934,14 @@
+     KFI_FOUND_FONTCONFIG=0
+     # check for fontconfig...
+ 
+-   echo "$as_me:$LINENO: checking for fontconfig-config" >&5
+-echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for fontconfig-config" >&5
 +echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6; }
-+   if test -n "$FONTCONFIG_CONFIG"; then
-+        kde_cv_path="$FONTCONFIG_CONFIG";
-+   else
-+        kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
-+
+    if test -n "$FONTCONFIG_CONFIG"; then
+         kde_cv_path="$FONTCONFIG_CONFIG";
+    else
+         kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+        else  	  dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/fontconfig-config"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/fontconfig-config  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/fontconfig-config"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/fontconfig-config"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -44094,18 +43984,18 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+
+ 
+ 
+-   echo "$as_me:$LINENO: checking for pkg-config" >&5
+-echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for pkg-config" >&5
 +echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6; }
-+   if test -n "$PKGCONFIG"; then
-+        kde_cv_path="$PKGCONFIG";
-+   else
-+        kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
-+
+    if test -n "$PKGCONFIG"; then
+         kde_cv_path="$PKGCONFIG";
+    else
+         kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+        else  	  dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/pkg-config"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/pkg-config  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/pkg-config"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/pkg-config"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -44148,23 +44038,23 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+
-+                { echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5
-+echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;}
-+
-+   else
+ 
+                 { echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5
+ echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;}
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      PKGCONFIG=$kde_cv_path
-+
-+   fi
-+
-+
-+   else
+       PKGCONFIG=$kde_cv_path
+ 
+    fi
+ 
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      FONTCONFIG_CONFIG=$kde_cv_path
-+
-+   fi
-+
-+
-+    if test -n "$PKGCONFIG"; then
-+        vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+        if test -n "$vers" && test "$vers" -ge 2000000 ; then
-+            LIBFONTCONFIG_LIBS="`$PKGCONFIG fontconfig --libs`"
-+            LIBFONTCONFIG_RPATH=
-+            for args in $LIBFONTCONFIG_LIBS; do
-+                case $args in
-+                    -L*)
-+                        LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+                        ;;
-+                esac
-+            done
-+            LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | sed -e "s/-L/-R/g"`
-+            LIBFONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`"
-+            KFI_FOUND_FONTCONFIG=1
-+        fi
-+    fi
-+
-+    if test -n "$FONTCONFIG_CONFIG"; then
-+        vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+        if test -n "$vers" && test "$vers" -ge 2000000 ; then
-+            LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`"
-+            LIBFONTCONFIG_RPATH=
-+            for args in $LIBFONTCONFIG_LIBS; do
-+                case $args in
-+                    -L*)
-+                        LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+                        ;;
-+                esac
-+            done
-+            LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | sed -e "s/-L/-R/g"`
-+            LIBFONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`"
-+            KFI_FOUND_FONTCONFIG=1
-+        fi
-+    fi
-+
-+    if test "$KFI_FOUND_FONTCONFIG" -eq 1; then
-+
-+
-+
-+
-+        # Check OS...
+       FONTCONFIG_CONFIG=$kde_cv_path
+ 
+    fi
+@@ -44212,8 +44102,8 @@
+ 
+ 
+         # Check OS...
+-        echo "$as_me:$LINENO: checking OS" >&5
+-echo $ECHO_N "checking OS... $ECHO_C" >&6
 +        { echo "$as_me:$LINENO: checking OS" >&5
 +echo $ECHO_N "checking OS... $ECHO_C" >&6; }
-+        case "$host" in
-+            *-*-linux*) UNAME='Linux' ;;
-+            *-*-freebsd*) UNAME='FreeBSD' ;;
-+            *-*-kfreebsd-gnu*) UNAME='GNU/kFreeBSD' ;;
-+            *-*-netbsd*) UNAME='NetBSD' ;;
-+            *-*-solaris*) UNAME='Solaris' ;;
-+            *-*-irix*) UNAME='Irix' ;;
-+            *-*-aix*) UNAME='AIX' ;;
-+            *-*-hpux*) UNAME='HPUX' ;;
-+            *-*-darwin*) UNAME='Darwin' ;;
-+            *) UNAME='Unknown' ;;
-+            esac
+         case "$host" in
+             *-*-linux*) UNAME='Linux' ;;
+             *-*-freebsd*) UNAME='FreeBSD' ;;
+@@ -44226,8 +44116,8 @@
+             *-*-darwin*) UNAME='Darwin' ;;
+             *) UNAME='Unknown' ;;
+             esac
+-                echo "$as_me:$LINENO: result: $UNAME" >&5
+-echo "${ECHO_T}$UNAME" >&6
 +                { echo "$as_me:$LINENO: result: $UNAME" >&5
 +echo "${ECHO_T}$UNAME" >&6; }
-+
-+
-+        # Check for fontenc...
-+        ac_font_enc_headers=0
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ 
+ 
+         # Check for fontenc...
+@@ -44236,8 +44126,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+   if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then
+ 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'
+@@ -44247,17 +44136,17 @@
+ 
+ 
+    if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/fonts/fontenc.h" >&5
+-echo $ECHO_N "checking for X11/fonts/fontenc.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for X11/fonts/fontenc.h" >&5
 +echo $ECHO_N "checking for X11/fonts/fontenc.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_fonts_fontenc_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_fonts_fontenc_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_fonts_fontenc_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_fonts_fontenc_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/fonts/fontenc.h usability" >&5
+-echo $ECHO_N "checking X11/fonts/fontenc.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X11/fonts/fontenc.h usability" >&5
 +echo $ECHO_N "checking X11/fonts/fontenc.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <X11/fonts/fontenc.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -44268,41 +44157,37 @@
+ #include <X11/fonts/fontenc.h>
+ _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;;
@@ -60386,38 +45158,59 @@
 +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
+   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_cxx_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_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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking X11/fonts/fontenc.h presence" >&5
+-echo $ECHO_N "checking X11/fonts/fontenc.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X11/fonts/fontenc.h presence" >&5
 +echo $ECHO_N "checking X11/fonts/fontenc.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/fonts/fontenc.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -44311,24 +44196,22 @@
+ /* end confdefs.h.  */
+ #include <X11/fonts/fontenc.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -60425,118 +45218,100 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -44336,9 +44219,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -44362,25 +44246,18 @@
+ echo "$as_me: WARNING: X11/fonts/fontenc.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: X11/fonts/fontenc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: X11/fonts/fontenc.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: X11/fonts/fontenc.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: X11/fonts/fontenc.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: X11/fonts/fontenc.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: X11/fonts/fontenc.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: X11/fonts/fontenc.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/fonts/fontenc.h" >&5
+-echo $ECHO_N "checking for X11/fonts/fontenc.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for X11/fonts/fontenc.h" >&5
 +echo $ECHO_N "checking for X11/fonts/fontenc.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_X11_fonts_fontenc_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_fonts_fontenc_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_fonts_fontenc_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_fonts_fontenc_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_fonts_fontenc_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_fonts_fontenc_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_X11_fonts_fontenc_h = yes; then
-+  ac_font_enc_headers=1
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+        if test "$ac_font_enc_headers" = "0"; then
-+            { echo "$as_me:$LINENO: WARNING: FontEnc headers not found. FontEnc support disabled" >&5
-+echo "$as_me: WARNING: FontEnc headers not found. FontEnc support disabled" >&2;}
-+        else
-+            ac_LDFLAGS_save="$LDFLAGS"
-+            ld_shared_flag=
-+
+ 
+ fi
+ if test $ac_cv_header_X11_fonts_fontenc_h = yes; then
+@@ -44403,16 +44280,15 @@
+             ac_LDFLAGS_save="$LDFLAGS"
+             ld_shared_flag=
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
+-echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
 +echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6; }
-+kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -shared"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -44439,34 +44315,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -60544,88 +45319,98 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -44479,13 +44353,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ ld_shared_flag="-shared"
-+else
+  :
+  ld_shared_flag="-shared"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+            LDFLAGS="$LDFLAGS $ld_shared_flag $all_libraries -lz"
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
+  :
+ 
+ fi
+@@ -44500,8 +44374,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for FontEncDirectory in -lfontenc" >&5
+-echo $ECHO_N "checking for FontEncDirectory in -lfontenc... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for FontEncDirectory in -lfontenc" >&5
 +echo $ECHO_N "checking for FontEncDirectory in -lfontenc... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_fontenc_FontEncDirectory+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lfontenc  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_fontenc_FontEncDirectory+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -44514,56 +44388,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char FontEncDirectory ();
-+int
-+main ()
-+{
+ #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 FontEncDirectory ();
+ int
+ main ()
+ {
+-FontEncDirectory ();
 +return FontEncDirectory ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -60633,83 +45418,81 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_fontenc_FontEncDirectory=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_fontenc_FontEncDirectory=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_fontenc_FontEncDirectory=no
 +	ac_cv_lib_fontenc_FontEncDirectory=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_fontenc_FontEncDirectory" >&5
+-echo "${ECHO_T}$ac_cv_lib_fontenc_FontEncDirectory" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_fontenc_FontEncDirectory" >&5
 +echo "${ECHO_T}$ac_cv_lib_fontenc_FontEncDirectory" >&6; }
-+if test $ac_cv_lib_fontenc_FontEncDirectory = yes; then
-+  ac_font_enc_lib=1
-+else
-+  ac_font_enc_lib=0
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+            if test "$ac_font_enc_lib" = "1"; then
-+                LIB_FONT_ENC="-lfontenc"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_FONT_ENC 1
-+_ACEOF
-+
-+            fi
-+            LDFLAGS="$ac_LDFLAGS_save"
-+        fi
-+
-+
-+        FONTINST_SUBDIR="kfontinst"
-+        # Check for Xft...
-+        ac_xft_headers=0
-+        ac_CXXFLAGS_save="$CXXFLAGS"
-+        ac_CFLAGS_save="$CFLAGS"
-+        ac_CPPFLAGS_save="$CPPFLAGS"
-+        CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $LIBFREETYPE_CFLAGS"
-+        CFLAGS="$CXXFLAGS"
-+        CPPFLAGS="$CXXFLAGS"
-+
-+        if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
+ if test $ac_cv_lib_fontenc_FontEncDirectory = yes; then
+   ac_font_enc_lib=1
+ else
+@@ -44596,17 +44467,17 @@
+         CPPFLAGS="$CXXFLAGS"
+ 
+         if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
+-echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
 +echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5
+-echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5
 +echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <X11/Xft/Xft.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -44617,41 +44488,37 @@
+ #include <X11/Xft/Xft.h>
+ _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;;
@@ -60717,38 +45500,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5
+-echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5
 +echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xft/Xft.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -44660,24 +44527,22 @@
+ /* end confdefs.h.  */
+ #include <X11/Xft/Xft.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -60756,173 +45560,126 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -44685,9 +44550,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -44711,25 +44577,18 @@
+ echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: X11/Xft/Xft.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: X11/Xft/Xft.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
+-echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
 +echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_X11_Xft_Xft_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_Xft_Xft_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_X11_Xft_Xft_h = yes; then
-+  ac_xft_headers=1
-+fi
-+
-+
-+        if test "$ac_xft_headers" -eq 1 ; then
-+            LIBXFT_LIB=-lXft
-+
-+        else
-+            { echo "$as_me:$LINENO: WARNING: Missing Xft headers - disabling font previews!" >&5
-+echo "$as_me: WARNING: Missing Xft headers - disabling font previews!" >&2;}
-+        fi
-+        CXXFLAGS="$ac_CXXFLAGS_save"
-+        CFLAGS="$ac_CFLAGS_save"
-+        CPPFLAGS="$ac_CPPFLAGS_save"
-+    else
-+        { echo "$as_me:$LINENO: WARNING: Missing FontConfig - disabling kfontinst!" >&5
-+echo "$as_me: WARNING: Missing FontConfig - disabling kfontinst!" >&2;}
-+    fi
-+else
-+    { echo "$as_me:$LINENO: WARNING: Missing FreeType2 - disabling kfontinst!" >&5
-+echo "$as_me: WARNING: Missing FreeType2 - disabling kfontinst!" >&2;}
-+fi
-+
-+
-+
-+if test "$ac_xft_headers" -eq 1; then
-+  include_fontinst_tn_TRUE=
-+  include_fontinst_tn_FALSE='#'
-+else
-+  include_fontinst_tn_TRUE='#'
-+  include_fontinst_tn_FALSE=
-+fi
-+
-+
-+if test "$ac_xft_headers" -eq 1 ; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_XFT 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+if test -n "$FONTINST_SUBDIR"; then
-+  include_kcontrol_kfontinst_TRUE=
-+  include_kcontrol_kfontinst_FALSE='#'
-+else
-+  include_kcontrol_kfontinst_TRUE='#'
-+  include_kcontrol_kfontinst_FALSE=
-+fi
-+
-+
-+
-+
-+for ac_func in getifaddrs getnameinfo
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ 
+ fi
+ if test $ac_cv_header_X11_Xft_Xft_h = yes; then
+@@ -44791,9 +44650,9 @@
+ for ac_func in getifaddrs getnameinfo
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -44819,68 +44678,60 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -60930,64 +45687,68 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -44889,8 +44740,8 @@
+ fi
+ done
+ 
+-echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
+-echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
 +echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6; }
-+if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+
-+int
-+main ()
-+{
-+static struct sockaddr ac_aggr;
-+if (ac_aggr.sa_len)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -44915,33 +44766,28 @@
+ }
+ _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;;
@@ -60995,41 +45756,45 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_member_struct_sockaddr_sa_len=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_member_struct_sockaddr_sa_len=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+
-+int
-+main ()
-+{
-+static struct sockaddr ac_aggr;
-+if (sizeof ac_aggr.sa_len)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -44962,40 +44808,37 @@
+ }
+ _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;;
@@ -61037,76 +45802,83 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_member_struct_sockaddr_sa_len=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_member_struct_sockaddr_sa_len=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_member_struct_sockaddr_sa_len=no
 +	ac_cv_member_struct_sockaddr_sa_len=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
+-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_member_struct_sockaddr_sa_len" >&5
+-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6; }
-+if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
-+_ACEOF
-+
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
+ if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -45011,10 +44854,9 @@
+ 
+ 
+ 
+-
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+
-+for ac_header in X11/extensions/Xrandr.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 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'
+@@ -45027,9 +44869,9 @@
+ for ac_header in X11/extensions/Xrandr.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -45043,38 +44885,35 @@
+ #include <$ac_header>
+ _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;;
@@ -61114,87 +45886,86 @@
 +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
+   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_cxx_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_cxx_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=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
+ 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: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +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_header" | $as_tr_cpp` 1
-+_ACEOF
-+ xrandr_h=yes
-+else
-+  xrandr_h=no
-+fi
-+
-+done
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+if test "$xrandr_h" = yes; then
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -45104,8 +44943,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5
+-echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5
 +echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXrandr -lXrender -lXext $X_EXTRA_LIBS $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -45118,56 +44957,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XRRSetScreenConfigAndRate ();
-+int
-+main ()
-+{
+ #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 XRRSetScreenConfigAndRate ();
+ int
+ main ()
+ {
+-XRRSetScreenConfigAndRate ();
 +return XRRSetScreenConfigAndRate ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -61202,124 +45973,93 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_Xrandr_XRRSetScreenConfigAndRate=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no
 +	ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6; }
-+if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then
-+  LIB_XRANDR=-lXrandr
-+
-+cat >>confdefs.h <<_ACEOF
-+#define XRANDR_SUPPORT 1
-+_ACEOF
-+
-+    RANDR_SUBDIR="randr"
-+
-+else
-+  RANDR_SUBDIR=""
-+
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+else
-+  LIB_XRANDR=
-+fi
-+
-+
-+
-+if test -n "$RANDR_SUBDIR"; then
-+  include_kcontrol_randr_TRUE=
-+  include_kcontrol_randr_FALSE='#'
-+else
-+  include_kcontrol_randr_TRUE='#'
-+  include_kcontrol_randr_FALSE=
-+fi
-+
-+
-+
-+
-+ test -z "$GL_LDFLAGS" && GL_LDFLAGS=
-+ test -z "$GL_INCLUDE" && GL_INCLUDE=
-+
-+
+ if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then
+   LIB_XRANDR=-lXrandr
+ 
+@@ -45206,28 +45042,27 @@
+  test -z "$GL_INCLUDE" && GL_INCLUDE=
+ 
+ 
+-# Check whether --with-gl or --without-gl was given.
 +# Check whether --with-gl was given.
-+if test "${with_gl+set}" = set; then
+ if test "${with_gl+set}" = set; then
+-  withval="$with_gl"
+-  gl_test=$withval
 +  withval=$with_gl; gl_test=$withval
-+else
-+  gl_test="yes"
+ else
+   gl_test="yes"
+-fi;
 +fi
 +
-+ if test "x$kde_use_qt_emb" = "xyes"; then
-+   # GL and Qt Embedded is a no-go for now.
-+   ac_cv_have_gl=no
-+ elif test "x$gl_test" = xno; then
-+   ac_cv_have_gl=no
-+ else
+  if test "x$kde_use_qt_emb" = "xyes"; then
+    # GL and Qt Embedded is a no-go for now.
+    ac_cv_have_gl=no
+  elif test "x$gl_test" = xno; then
+    ac_cv_have_gl=no
+  else
+-   echo "$as_me:$LINENO: checking for GL" >&5
+-echo $ECHO_N "checking for GL... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for GL" >&5
 +echo $ECHO_N "checking for GL... $ECHO_C" >&6; }
-+   if test "${ac_cv_have_gl+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+    if test "${ac_cv_have_gl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    ac_save_ldflags=$LDFLAGS
-+    ac_save_cxxflags=$CXXFLAGS
-+    ac_save_libs=$LIBS
-+    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
-+    LIBS="$LIBS -lGL -lGLU"
-+    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
-+    LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
-+    CXXFLAGS="$CFLAGS $X_INCLUDES"
-+    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <GL/gl.h>
-+#include <GL/glu.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -45263,35 +45098,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -61327,94 +46067,97 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_have_gl="yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_have_gl="yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_gl="no"
 +	ac_cv_have_gl="no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+    LDFLAGS=$ac_save_ldflags
-+    CXXFLAGS=$ac_save_cxxflags
-+    LIBS=$ac_save_libs
-+
-+fi
-+
-+  if test "$ac_cv_have_gl" = "no"; then
+       conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -45306,8 +45138,8 @@
+ fi
+ 
+   if test "$ac_cv_have_gl" = "no"; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +    { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+    GL_LDFLAGS=""
-+    GLINC=""
-+
-+
-+  else
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GL 1
-+_ACEOF
-+
-+    if test "$GL_LDFLAGS" = ""; then
-+       GLLIB='-lGLU -lGL $(LIB_X11)'
-+    else
-+       GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
-+    fi
-+    if test "$GL_INCLUDE" = ""; then
-+       GLINC=""
-+    else
-+       GLINC="-I$GL_INCLUDE"
-+    fi
+     GL_LDFLAGS=""
+     GLINC=""
+ 
+@@ -45328,11 +45160,11 @@
+     else
+        GLINC="-I$GL_INCLUDE"
+     fi
+-    echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
+-echo "${ECHO_T}$ac_cv_have_gl" >&6
 +    { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
 +echo "${ECHO_T}$ac_cv_have_gl" >&6; }
-+
+ 
+-    echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5
+-echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5
 +echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lGL  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -45345,56 +45177,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char glXChooseVisual ();
-+int
-+main ()
-+{
+ #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 glXChooseVisual ();
+ int
+ main ()
+ {
+-glXChooseVisual ();
 +return glXChooseVisual ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -61422,83 +46165,91 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_GL_glXChooseVisual=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_GL_glXChooseVisual=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_GL_glXChooseVisual=no
 +	ac_cv_lib_GL_glXChooseVisual=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5
+-echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5
 +echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6; }
-+if test $ac_cv_lib_GL_glXChooseVisual = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GLXCHOOSEVISUAL 1
-+_ACEOF
-+
-+
-+fi
-+
-+
-+  fi
-+ fi
-+
-+
-+
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ if test $ac_cv_lib_GL_glXChooseVisual = yes; then
+ 
+ 
+@@ -45417,8 +45246,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+   if test "${ac_cv_header_kcarddb_h+set}" = set; then
+ 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'
+@@ -45428,17 +45256,17 @@
+ 
+ 
+    if test "${ac_cv_header_kcarddb_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for kcarddb.h" >&5
+-echo $ECHO_N "checking for kcarddb.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for kcarddb.h" >&5
 +echo $ECHO_N "checking for kcarddb.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_kcarddb_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_kcarddb_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_kcarddb_h" >&5
+-echo "${ECHO_T}$ac_cv_header_kcarddb_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_kcarddb_h" >&5
 +echo "${ECHO_T}$ac_cv_header_kcarddb_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking kcarddb.h usability" >&5
+-echo $ECHO_N "checking kcarddb.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking kcarddb.h usability" >&5
 +echo $ECHO_N "checking kcarddb.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <kcarddb.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -45449,41 +45277,37 @@
+ #include <kcarddb.h>
+ _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;;
@@ -61506,38 +46257,59 @@
 +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
+   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_cxx_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_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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking kcarddb.h presence" >&5
+-echo $ECHO_N "checking kcarddb.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking kcarddb.h presence" >&5
 +echo $ECHO_N "checking kcarddb.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <kcarddb.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -45492,24 +45316,22 @@
+ /* end confdefs.h.  */
+ #include <kcarddb.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -61545,179 +46317,146 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -45517,9 +45339,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -45543,25 +45366,18 @@
+ echo "$as_me: WARNING: kcarddb.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: kcarddb.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: kcarddb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: kcarddb.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: kcarddb.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: kcarddb.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: kcarddb.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: kcarddb.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: kcarddb.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: kcarddb.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: kcarddb.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: kcarddb.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: kcarddb.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: kcarddb.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: kcarddb.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for kcarddb.h" >&5
+-echo $ECHO_N "checking for kcarddb.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for kcarddb.h" >&5
 +echo $ECHO_N "checking for kcarddb.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_kcarddb_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_kcarddb_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_kcarddb_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_kcarddb_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_kcarddb_h" >&5
+-echo "${ECHO_T}$ac_cv_header_kcarddb_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_kcarddb_h" >&5
 +echo "${ECHO_T}$ac_cv_header_kcarddb_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_kcarddb_h = yes; then
-+  FOUND_KSMCARD="yes"
-+else
-+  FOUND_KSMCARD="no"
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+
-+
-+if test "$FOUND_KSMCARD" = "yes"; then
-+  include_kcontrol_smartcard_TRUE=
-+  include_kcontrol_smartcard_FALSE='#'
-+else
-+  include_kcontrol_smartcard_TRUE='#'
-+  include_kcontrol_smartcard_FALSE=
-+fi
-+
-+
-+case "$host" in
-+  *-*-linux*|*-*-freebsd*|*-*-kfreebsd*-gnu)
-+	FOUND_USBVIEW=yes
-+	;;
-+esac
-+
-+
-+
-+if test "$FOUND_USBVIEW" = "yes"; then
-+  include_kcontrol_usbview_TRUE=
-+  include_kcontrol_usbview_FALSE='#'
-+else
-+  include_kcontrol_usbview_TRUE='#'
-+  include_kcontrol_usbview_FALSE=
-+fi
-+
-+
-+
+ 
+ fi
+ if test $ac_cv_header_kcarddb_h = yes; then
+@@ -45608,11 +45424,11 @@
+ 
+ 
+ 
+-# Check whether --with-usbids or --without-usbids was given.
 +# Check whether --with-usbids was given.
-+if test "${with_usbids+set}" = set; then
+ if test "${with_usbids+set}" = set; then
+-  withval="$with_usbids"
 +  withval=$with_usbids;
 +fi
-+
-+
-+if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define USBIDS_FILE "$with_usbids"
-+_ACEOF
-+
-+  dont_install_usbids="yes"
-+fi
-+
-+
-+
-+if test "x$dont_install_usbids" != "xyes"; then
-+  install_usbids_TRUE=
-+  install_usbids_FALSE='#'
-+else
-+  install_usbids_TRUE='#'
-+  install_usbids_FALSE=
-+fi
-+
-+
-+
+ 
+-fi;
+ 
+ if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then
+ 
+@@ -45635,13 +45451,13 @@
+ 
+ 
+ 
+-# Check whether --with-libraw1394 or --without-libraw1394 was given.
 +# Check whether --with-libraw1394 was given.
-+if test "${with_libraw1394+set}" = set; then
+ if test "${with_libraw1394+set}" = set; then
+-  withval="$with_libraw1394"
+-
 +  withval=$with_libraw1394;
-+else
-+  with_libraw1394=check
+ else
+   with_libraw1394=check
+-fi;
 +fi
 +
-+
-+VIEW1394_SUBDIR=
-+if test "x$with_libraw1394" != xno; then
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ 
+ VIEW1394_SUBDIR=
+ if test "x$with_libraw1394" != xno; then
+@@ -45649,8 +45465,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+   if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
+ 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'
+@@ -45660,17 +45475,17 @@
+ 
+ 
+    if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5
+-echo $ECHO_N "checking for libraw1394/raw1394.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5
 +echo $ECHO_N "checking for libraw1394/raw1394.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libraw1394_raw1394_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5
 +echo "${ECHO_T}$ac_cv_header_libraw1394_raw1394_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking libraw1394/raw1394.h usability" >&5
+-echo $ECHO_N "checking libraw1394/raw1394.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking libraw1394/raw1394.h usability" >&5
 +echo $ECHO_N "checking libraw1394/raw1394.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <libraw1394/raw1394.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -45681,41 +45496,37 @@
+ #include <libraw1394/raw1394.h>
+ _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;;
@@ -61725,38 +46464,59 @@
 +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
+   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_cxx_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_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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking libraw1394/raw1394.h presence" >&5
+-echo $ECHO_N "checking libraw1394/raw1394.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking libraw1394/raw1394.h presence" >&5
 +echo $ECHO_N "checking libraw1394/raw1394.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <libraw1394/raw1394.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -45724,24 +45535,22 @@
+ /* end confdefs.h.  */
+ #include <libraw1394/raw1394.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -61764,152 +46524,126 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -45749,9 +45558,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -45775,25 +45585,18 @@
+ echo "$as_me: WARNING: libraw1394/raw1394.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libraw1394/raw1394.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libraw1394/raw1394.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: libraw1394/raw1394.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libraw1394/raw1394.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: libraw1394/raw1394.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: libraw1394/raw1394.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libraw1394/raw1394.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5
+-echo $ECHO_N "checking for libraw1394/raw1394.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5
 +echo $ECHO_N "checking for libraw1394/raw1394.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_libraw1394_raw1394_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_libraw1394_raw1394_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libraw1394_raw1394_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5
 +echo "${ECHO_T}$ac_cv_header_libraw1394_raw1394_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_libraw1394_raw1394_h = yes; then
-+  VIEW1394_SUBDIR=view1394
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+
-+  if test "x$with_libraw1394" != xcheck && test -z "$VIEW1394_SUBDIR"; then
-+    { { echo "$as_me:$LINENO: error: --with-libraw1394 was given, but test for libraw1394 failed" >&5
-+echo "$as_me: error: --with-libraw1394 was given, but test for libraw1394 failed" >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+fi
-+
-+
-+
-+if test -n "$VIEW1394_SUBDIR"; then
-+  include_kcontrol_view1394_TRUE=
-+  include_kcontrol_view1394_FALSE='#'
-+else
-+  include_kcontrol_view1394_TRUE='#'
-+  include_kcontrol_view1394_FALSE=
-+fi
-+
-+
-+
-+
-+
-+for ac_func in sigset sigaction
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ 
+ fi
+ if test $ac_cv_header_libraw1394_raw1394_h = yes; then
+@@ -45834,9 +45637,9 @@
+ for ac_func in sigset sigaction
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -45862,68 +45665,60 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -61917,83 +46651,92 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+xss_save_ldflags="$LDFLAGS"
-+LDFLAGS="$X_LDFLAGS"
-+
-+LIB_XSS=
-+
-+
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -45939,19 +45734,18 @@
+ LIB_XSS=
+ 
+ 
+-# Check whether --with-xscreensaver or --without-xscreensaver was given.
 +# Check whether --with-xscreensaver was given.
-+if test "${with_xscreensaver+set}" = set; then
+ if test "${with_xscreensaver+set}" = set; then
+-  withval="$with_xscreensaver"
 +  withval=$with_xscreensaver;
 +fi
-+
-+
-+if test "x$with_xscreensaver" != "xno"; then
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ 
+-fi;
+ 
+ if test "x$with_xscreensaver" != "xno"; then
+ 
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
+ 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'
+@@ -45960,8 +45754,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5
+-echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5
 +echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+     #include <X11/Xlib.h>
-+
-+
-+#include <X11/extensions/scrnsaver.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -45978,42 +45772,38 @@
+ #include <X11/extensions/scrnsaver.h>
+ _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;;
@@ -62001,59 +46744,80 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_X11_extensions_scrnsaver_h=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_header_X11_extensions_scrnsaver_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_scrnsaver_h=no
 +	ac_cv_header_X11_extensions_scrnsaver_h=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_header_X11_extensions_scrnsaver_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6; }
-+if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then
-+
+ if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then
+ 
+-    echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
+-echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
 +echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXext  $X_PRE_LIBS -lX11 $X_EXTRA_LIBS  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46026,56 +45816,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XScreenSaverQueryInfo ();
-+int
-+main ()
-+{
+ #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 XScreenSaverQueryInfo ();
+ int
+ main ()
+ {
+-XScreenSaverQueryInfo ();
 +return XScreenSaverQueryInfo ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -62061,80 +46825,78 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_Xext_XScreenSaverQueryInfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xext_XScreenSaverQueryInfo=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xext_XScreenSaverQueryInfo=no
 +	ac_cv_lib_Xext_XScreenSaverQueryInfo=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; }
-+if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_XSCREENSAVER 1
-+_ACEOF
-+
-+	LIB_XSS="-lXext"
-+
-+else
-+
-+        ld_shared_flag=
-+        xss_save_cxxflags="$CXXFLAGS"
-+        CXXFLAGS="$CXXFLAGS $lt_prog_compiler_pic_CXX"
-+
+ if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
+ 
+ 
+@@ -46091,16 +45878,15 @@
+         xss_save_cxxflags="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $lt_prog_compiler_pic_CXX"
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
+-echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
 +echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6; }
-+kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -shared"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -46127,37 +45913,35 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -62142,78 +46904,99 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+-  ac_ext=cc
 +  ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+ 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'
+@@ -46167,19 +45951,19 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+ ld_shared_flag="-shared"
-+else
+  :
+  ld_shared_flag="-shared"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
+  :
+ 
+ fi
+ 
+-        echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
+-echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6
 +        { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
 +echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXss  $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46192,56 +45976,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XScreenSaverQueryInfo ();
-+int
-+main ()
-+{
+ #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 XScreenSaverQueryInfo ();
+ int
+ main ()
+ {
+-XScreenSaverQueryInfo ();
 +return XScreenSaverQueryInfo ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -62221,98 +47004,78 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_Xss_XScreenSaverQueryInfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xss_XScreenSaverQueryInfo=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xss_XScreenSaverQueryInfo=no
 +	ac_cv_lib_Xss_XScreenSaverQueryInfo=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; }
-+if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_XSCREENSAVER 1
-+_ACEOF
-+
-+            LIB_XSS="-lXss"
-+
-+fi
-+
-+        CXXFLAGS="$xss_save_cxxflags"
-+
-+fi
-+
-+
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+fi
-+
-+
-+LDFLAGS="$xss_save_ldflags"
-+
-+xss_save_ldflags="$LDFLAGS"
-+LDFLAGS="$X_LDFLAGS"
-+
-+LIB_XF86MISC=
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
+ 
+ 
+@@ -46283,8 +46064,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
+ 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'
+@@ -46293,8 +46073,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/xf86misc.h" >&5
+-echo $ECHO_N "checking for X11/extensions/xf86misc.h... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for X11/extensions/xf86misc.h" >&5
 +echo $ECHO_N "checking for X11/extensions/xf86misc.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_xf86misc_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+    #include <X11/Xlib.h>
-+
-+
-+#include <X11/extensions/xf86misc.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_X11_extensions_xf86misc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46311,42 +46091,38 @@
+ #include <X11/extensions/xf86misc.h>
+ _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;;
@@ -62320,59 +47083,80 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_X11_extensions_xf86misc_h=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_header_X11_extensions_xf86misc_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_xf86misc_h=no
 +	ac_cv_header_X11_extensions_xf86misc_h=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_header_X11_extensions_xf86misc_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86misc_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86misc_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86misc_h" >&6; }
-+if test $ac_cv_header_X11_extensions_xf86misc_h = yes; then
-+
+ if test $ac_cv_header_X11_extensions_xf86misc_h = yes; then
+ 
+-    echo "$as_me:$LINENO: checking for XF86MiscQueryVersion in -lXxf86misc" >&5
+-echo $ECHO_N "checking for XF86MiscQueryVersion in -lXxf86misc... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for XF86MiscQueryVersion in -lXxf86misc" >&5
 +echo $ECHO_N "checking for XF86MiscQueryVersion in -lXxf86misc... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xxf86misc_XF86MiscQueryVersion+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXxf86misc  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_Xxf86misc_XF86MiscQueryVersion+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46359,56 +46135,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XF86MiscQueryVersion ();
-+int
-+main ()
-+{
+ #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 XF86MiscQueryVersion ();
+ int
+ main ()
+ {
+-XF86MiscQueryVersion ();
 +return XF86MiscQueryVersion ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -62380,86 +47164,88 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_Xxf86misc_XF86MiscQueryVersion=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xxf86misc_XF86MiscQueryVersion=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xxf86misc_XF86MiscQueryVersion=no
 +	ac_cv_lib_Xxf86misc_XF86MiscQueryVersion=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&6; }
-+if test $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_XF86MISC 1
-+_ACEOF
-+
-+	LIB_XF86MISC="-lXxf86misc"
-+
-+fi
-+
-+
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+
-+
-+if test -n "$LIB_XF86MISC"; then
+ if test $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion = yes; then
+ 
+ 
+@@ -46435,8 +46208,8 @@
+ 
+ 
+ if test -n "$LIB_XF86MISC"; then
+-    echo "$as_me:$LINENO: checking for XF86MiscSetGrabKeysState in -lXxf86misc" >&5
+-echo $ECHO_N "checking for XF86MiscSetGrabKeysState in -lXxf86misc... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for XF86MiscSetGrabKeysState in -lXxf86misc" >&5
 +echo $ECHO_N "checking for XF86MiscSetGrabKeysState in -lXxf86misc... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXxf86misc  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46449,56 +46222,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XF86MiscSetGrabKeysState ();
-+int
-+main ()
-+{
+ #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 XF86MiscSetGrabKeysState ();
+ int
+ main ()
+ {
+-XF86MiscSetGrabKeysState ();
 +return XF86MiscSetGrabKeysState ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -62467,106 +47253,93 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_Xxf86misc_XF86MiscSetGrabKeysState=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=no
 +	ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&6; }
-+if test $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_XF86MISCSETGRABKEYSSTATE 1
-+_ACEOF
-+
-+
-+fi
-+
-+fi
-+
-+LDFLAGS="$xss_save_ldflags"
-+
-+
-+
-+ test -z "$GL_LDFLAGS" && GL_LDFLAGS=
-+ test -z "$GL_INCLUDE" && GL_INCLUDE=
-+
-+
+ if test $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState = yes; then
+ 
+ 
+@@ -46519,28 +46289,27 @@
+  test -z "$GL_INCLUDE" && GL_INCLUDE=
+ 
+ 
+-# Check whether --with-gl or --without-gl was given.
 +# Check whether --with-gl was given.
-+if test "${with_gl+set}" = set; then
+ if test "${with_gl+set}" = set; then
+-  withval="$with_gl"
+-  gl_test=$withval
 +  withval=$with_gl; gl_test=$withval
-+else
-+  gl_test="yes"
+ else
+   gl_test="yes"
+-fi;
 +fi
 +
-+ if test "x$kde_use_qt_emb" = "xyes"; then
-+   # GL and Qt Embedded is a no-go for now.
-+   ac_cv_have_gl=no
-+ elif test "x$gl_test" = xno; then
-+   ac_cv_have_gl=no
-+ else
+  if test "x$kde_use_qt_emb" = "xyes"; then
+    # GL and Qt Embedded is a no-go for now.
+    ac_cv_have_gl=no
+  elif test "x$gl_test" = xno; then
+    ac_cv_have_gl=no
+  else
+-   echo "$as_me:$LINENO: checking for GL" >&5
+-echo $ECHO_N "checking for GL... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for GL" >&5
 +echo $ECHO_N "checking for GL... $ECHO_C" >&6; }
-+   if test "${ac_cv_have_gl+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+    if test "${ac_cv_have_gl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    ac_save_ldflags=$LDFLAGS
-+    ac_save_cxxflags=$CXXFLAGS
-+    ac_save_libs=$LIBS
-+    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
-+    LIBS="$LIBS -lGL -lGLU"
-+    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
-+    LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
-+    CXXFLAGS="$CFLAGS $X_INCLUDES"
-+    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <GL/gl.h>
-+#include <GL/glu.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -46576,35 +46345,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -62574,94 +47347,98 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f 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_cxx_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=$?
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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_have_gl="yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_have_gl="yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_gl="no"
 +	ac_cv_have_gl="no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+    LDFLAGS=$ac_save_ldflags
-+    CXXFLAGS=$ac_save_cxxflags
-+    LIBS=$ac_save_libs
-+
-+fi
-+
-+  if test "$ac_cv_have_gl" = "no"; then
+       conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -46619,8 +46385,8 @@
+ fi
+ 
+   if test "$ac_cv_have_gl" = "no"; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +    { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+    GL_LDFLAGS=""
-+    GLINC=""
-+
-+
-+  else
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GL 1
-+_ACEOF
-+
-+    if test "$GL_LDFLAGS" = ""; then
-+       GLLIB='-lGLU -lGL $(LIB_X11)'
-+    else
-+       GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
-+    fi
-+    if test "$GL_INCLUDE" = ""; then
-+       GLINC=""
-+    else
-+       GLINC="-I$GL_INCLUDE"
-+    fi
+     GL_LDFLAGS=""
+     GLINC=""
+ 
+@@ -46641,11 +46407,11 @@
+     else
+        GLINC="-I$GL_INCLUDE"
+     fi
+-    echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
+-echo "${ECHO_T}$ac_cv_have_gl" >&6
 +    { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
 +echo "${ECHO_T}$ac_cv_have_gl" >&6; }
-+
+ 
+-    echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5
+-echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5
 +echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lGL  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46658,56 +46424,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char glXChooseVisual ();
-+int
-+main ()
-+{
+ #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 glXChooseVisual ();
+ int
+ main ()
+ {
+-glXChooseVisual ();
 +return glXChooseVisual ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -62669,101 +47446,90 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_GL_glXChooseVisual=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_GL_glXChooseVisual=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_GL_glXChooseVisual=no
 +	ac_cv_lib_GL_glXChooseVisual=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5
+-echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5
 +echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6; }
-+if test $ac_cv_lib_GL_glXChooseVisual = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GLXCHOOSEVISUAL 1
-+_ACEOF
-+
-+
-+fi
-+
-+
-+  fi
-+ fi
-+
-+
-+
-+
+ if test $ac_cv_lib_GL_glXChooseVisual = yes; then
+ 
+ 
+@@ -46725,8 +46488,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking \"struct ucred\"" >&5
+-echo $ECHO_N "checking \"struct ucred\"... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking \"struct ucred\"" >&5
 +echo $ECHO_N "checking \"struct ucred\"... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/socket.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "struct ucred" >/dev/null 2>&1; then
-+  have_ucred=yes
-+fi
-+rm -f conftest*
-+
-+if test "$have_ucred" = "yes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STRUCT_UCRED 1
-+_ACEOF
-+
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -46748,15 +46511,15 @@
+ #define HAVE_STRUCT_UCRED 1
+ _ACEOF
+ 
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +    { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+else
+ else
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +    { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
+ fi
+ 
+-echo "$as_me:$LINENO: checking nogroup" >&5
+-echo $ECHO_N "checking nogroup... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking nogroup" >&5
 +echo $ECHO_N "checking nogroup... $ECHO_C" >&6; }
-+if test "$cross_compiling" = yes; then
-+  nogroup=65534
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+    #include <grp.h>
-+    #include <sys/types.h>
-+
-+    int main()
-+    {
-+	struct group *grp = getgrnam("nogroup");
-+	if (grp) return 0;
-+	return 1;
-+    }
-+
-+_ACEOF
-+rm -f conftest$ac_exeext
+ if test "$cross_compiling" = yes; then
+   nogroup=65534
+ else
+@@ -46779,13 +46542,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -62771,47 +47537,26 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  nogroup=nogroup
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+if test "$cross_compiling" = yes; then
-+  nogroup=65534
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+    #include <grp.h>
-+    #include <sys/types.h>
-+
-+    int main()
-+    {
-+	struct group *grp = getgrnam("nobody");
-+	if (grp) return 0;
-+	return 1;
-+    }
-+
-+_ACEOF
-+rm -f conftest$ac_exeext
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46818,13 +46590,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -62819,94 +47564,93 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  nogroup=nobody
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+nogroup=65534
-+fi
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46837,21 +46618,25 @@
+ ( exit $ac_status )
+ nogroup=65534
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
 +
 +
-+fi
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $nogroup" >&5
+-echo "${ECHO_T}$nogroup" >&6
 +
 +
 +{ echo "$as_me:$LINENO: result: $nogroup" >&5
 +echo "${ECHO_T}$nogroup" >&6; }
-+
-+
-+for ac_func in getpeereid
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ 
+ 
+ for ac_func in getpeereid
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -46877,68 +46662,60 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -62914,245 +47658,206 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -46949,10 +46726,9 @@
+ 
+ 
+ 
+-# Check whether --with-sudo-kdesu-backend or --without-sudo-kdesu-backend was given.
 +# Check whether --with-sudo-kdesu-backend was given.
-+if test "${with_sudo_kdesu_backend+set}" = set; then
+ if test "${with_sudo_kdesu_backend+set}" = set; then
+-  withval="$with_sudo_kdesu_backend"
+-
 +  withval=$with_sudo_kdesu_backend;
-+    if test x$withval = xyes; then
-+        use_kdesu_backend="sudo"
-+    else
-+        use_kdesu_backend="su"
-+    fi
-+
-+else
-+  use_kdesu_backend="su"
-+
+     if test x$withval = xyes; then
+         use_kdesu_backend="sudo"
+     else
+@@ -46962,7 +46738,8 @@
+ else
+   use_kdesu_backend="su"
+ 
+-fi;
 +fi
 +
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define DEFAULT_SUPER_USER_COMMAND "$use_kdesu_backend"
-+_ACEOF
-+
-+
-+
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -46971,14 +46748,14 @@
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for xmkmf" >&5
+-echo $ECHO_N "checking for xmkmf... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for xmkmf" >&5
 +echo $ECHO_N "checking for xmkmf... $ECHO_C" >&6; }
-+   if test -n "$XMKMF"; then
-+        kde_cv_path="$XMKMF";
-+   else
-+        kde_cache=`echo xmkmf | sed 'y%./+-%__p_%'`
-+
+    if test -n "$XMKMF"; then
+         kde_cv_path="$XMKMF";
+    else
+         kde_cache=`echo xmkmf | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs=" $dirs"
-+        else  	  dirs="$dirs "
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/xmkmf"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/xmkmf  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/xmkmf"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/xmkmf"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -47021,21 +46798,21 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+      { { echo "$as_me:$LINENO: error: xmkmf/imake not found. Please make sure it's in PATH!" >&5
-+echo "$as_me: error: xmkmf/imake not found. Please make sure it's in PATH!" >&2;}
-+   { (exit 1); exit 1; }; }
-+   else
+       { { echo "$as_me:$LINENO: error: xmkmf/imake not found. Please make sure it's in PATH!" >&5
+ echo "$as_me: error: xmkmf/imake not found. Please make sure it's in PATH!" >&2;}
+    { (exit 1); exit 1; }; }
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      XMKMF=$kde_cv_path
-+
-+   fi
-+
-+
+       XMKMF=$kde_cv_path
+ 
+    fi
+ 
+ 
+-echo "$as_me:$LINENO: checking X paths" >&5
+-echo $ECHO_N "checking X paths... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X paths" >&5
 +echo $ECHO_N "checking X paths... $ECHO_C" >&6; }
-+imkv=8
-+test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
-+if test "${kde_cv_defines_imake+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+  rm -fr conftestdir
-+  if mkdir conftestdir; then
-+    cd conftestdir
-+    cat > Imakefile <<'EOF'
-+
-+acimake:
-+	@echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\""
-+
-+EOF
-+    if $XMKMF >&5 2>&1 && test -f Makefile; then
-+	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
-+	kde_cv_defines_imake_version=$imkv
-+    else
+ imkv=8
+ test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
+ if test "${kde_cv_defines_imake+set}" = set; then
+@@ -47055,8 +46832,8 @@
+ 	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
+ 	kde_cv_defines_imake_version=$imkv
+     else
+-        echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
 +        { echo "$as_me:$LINENO: result: failed" >&5
 +echo "${ECHO_T}failed" >&6; }
-+	{ { echo "$as_me:$LINENO: error: $XMKMF (imake) failed.
-+Make sure you have all necessary X development packages installed.
-+On some systems a missing /lib/cpp symlink is at fault." >&5
-+echo "$as_me: error: $XMKMF (imake) failed.
-+Make sure you have all necessary X development packages installed.
-+On some systems a missing /lib/cpp symlink is at fault." >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+    cd ..
-+    rm -fr conftestdir
-+  else
+ 	{ { echo "$as_me:$LINENO: error: $XMKMF (imake) failed.
+ Make sure you have all necessary X development packages installed.
+ On some systems a missing /lib/cpp symlink is at fault." >&5
+@@ -47068,8 +46845,8 @@
+     cd ..
+     rm -fr conftestdir
+   else
+-    echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
 +    { echo "$as_me:$LINENO: result: failed" >&5
 +echo "${ECHO_T}failed" >&6; }
-+    { { echo "$as_me:$LINENO: error: cannot create temporary directory" >&5
-+echo "$as_me: error: cannot create temporary directory" >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+
-+fi
-+
+     { { echo "$as_me:$LINENO: error: cannot create temporary directory" >&5
+ echo "$as_me: error: cannot create temporary directory" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -47077,8 +46854,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: done" >&5
+-echo "${ECHO_T}done" >&6
 +{ echo "$as_me:$LINENO: result: done" >&5
 +echo "${ECHO_T}done" >&6; }
-+eval "$kde_cv_defines_imake"
-+
-+cat >>confdefs.h <<_ACEOF
-+#define XBINDIR "$XBINDIR"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define XLIBDIR "$XLIBDIR"
-+_ACEOF
-+
-+
-+if test -f /etc/ttys; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define BSD_INIT 1
-+_ACEOF
-+
-+fi
-+
-+
-+for ac_func in getttyent
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ eval "$kde_cv_defines_imake"
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -47103,9 +46880,9 @@
+ for ac_func in getttyent
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -47131,68 +46908,60 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -63160,93 +47865,102 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+case $host_os in
-+	linux*) ac_cv_func_getutxent=no;;
-+	darwin*) ac_cv_func_getutxent=no;;
-+	kfreebsd*-gnu) ac_cv_func_getutxent=no;;
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -47205,8 +46974,8 @@
+ 	linux*) ac_cv_func_getutxent=no;;
+ 	darwin*) ac_cv_func_getutxent=no;;
+ 	kfreebsd*-gnu) ac_cv_func_getutxent=no;;
+-	*) echo "$as_me:$LINENO: checking for getutxent" >&5
+-echo $ECHO_N "checking for getutxent... $ECHO_C" >&6
 +	*) { echo "$as_me:$LINENO: checking for getutxent" >&5
 +echo $ECHO_N "checking for getutxent... $ECHO_C" >&6; }
-+if test "${ac_cv_func_getutxent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define getutxent to an innocuous variant, in case <limits.h> declares getutxent.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define getutxent innocuous_getutxent
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char getutxent (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef getutxent
-+
+ if test "${ac_cv_func_getutxent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47233,68 +47002,59 @@
+ 
+ #undef getutxent
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char getutxent ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 getutxent ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_getutxent) || defined (__stub___getutxent)
 +#if defined __stub_getutxent || defined __stub___getutxent
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = getutxent;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != getutxent;
 +return getutxent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -63254,89 +47968,101 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_getutxent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_func_getutxent=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_getutxent=no
 +	ac_cv_func_getutxent=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_getutxent" >&5
+-echo "${ECHO_T}$ac_cv_func_getutxent" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_getutxent" >&5
 +echo "${ECHO_T}$ac_cv_func_getutxent" >&6; }
-+;;
-+esac
-+if test $ac_cv_func_getutxent = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_UTMPX 1
-+_ACEOF
-+
-+else
+ ;;
+ esac
+ if test $ac_cv_func_getutxent = yes; then
+@@ -47304,8 +47064,8 @@
+ _ACEOF
+ 
+ else
+-	echo "$as_me:$LINENO: checking for getutent" >&5
+-echo $ECHO_N "checking for getutent... $ECHO_C" >&6
 +	{ echo "$as_me:$LINENO: checking for getutent" >&5
 +echo $ECHO_N "checking for getutent... $ECHO_C" >&6; }
-+if test "${ac_cv_func_getutent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define getutent to an innocuous variant, in case <limits.h> declares getutent.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define getutent innocuous_getutent
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char getutent (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef getutent
-+
+ if test "${ac_cv_func_getutent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47332,68 +47092,59 @@
+ 
+ #undef getutent
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char getutent ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 getutent ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_getutent) || defined (__stub___getutent)
 +#if defined __stub_getutent || defined __stub___getutent
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = getutent;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != getutent;
 +return getutent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -63344,65 +48070,67 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_getutent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_func_getutent=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_getutent=no
 +	ac_cv_func_getutent=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_getutent" >&5
+-echo "${ECHO_T}$ac_cv_func_getutent" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_getutent" >&5
 +echo "${ECHO_T}$ac_cv_func_getutent" >&6; }
-+if test $ac_cv_func_getutent = yes; then
-+  :
-+else
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define BSD_UTMP 1
-+_ACEOF
-+
-+fi
-+
-+fi
-+
+ if test $ac_cv_func_getutent = yes; then
+   :
+ else
+@@ -47406,8 +47157,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for struct utmp.ut_user" >&5
+-echo $ECHO_N "checking for struct utmp.ut_user... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for struct utmp.ut_user" >&5
 +echo $ECHO_N "checking for struct utmp.ut_user... $ECHO_C" >&6; }
-+if test "${ac_cv_member_struct_utmp_ut_user+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <utmp.h>
-+
-+int
-+main ()
-+{
-+static struct utmp ac_aggr;
-+if (ac_aggr.ut_user)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_member_struct_utmp_ut_user+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47430,33 +47181,28 @@
+ }
+ _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;;
@@ -63410,39 +48138,45 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_member_struct_utmp_ut_user=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_member_struct_utmp_ut_user=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <utmp.h>
-+
-+int
-+main ()
-+{
-+static struct utmp ac_aggr;
-+if (sizeof ac_aggr.ut_user)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -47475,40 +47221,37 @@
+ }
+ _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;;
@@ -63450,63 +48184,69 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_member_struct_utmp_ut_user=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_member_struct_utmp_ut_user=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_member_struct_utmp_ut_user=no
 +	ac_cv_member_struct_utmp_ut_user=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
+-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_member_struct_utmp_ut_user" >&5
+-echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_user" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_user" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_user" >&6; }
-+if test $ac_cv_member_struct_utmp_ut_user = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_UTMP_UT_USER 1
-+_ACEOF
-+
-+
-+fi
-+
+ if test $ac_cv_member_struct_utmp_ut_user = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -47518,8 +47261,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for struct passwd.pw_expire" >&5
+-echo $ECHO_N "checking for struct passwd.pw_expire... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for struct passwd.pw_expire" >&5
 +echo $ECHO_N "checking for struct passwd.pw_expire... $ECHO_C" >&6; }
-+if test "${ac_cv_member_struct_passwd_pw_expire+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <pwd.h>
-+
-+int
-+main ()
-+{
-+static struct passwd ac_aggr;
-+if (ac_aggr.pw_expire)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_member_struct_passwd_pw_expire+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47542,33 +47285,28 @@
+ }
+ _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;;
@@ -63514,39 +48254,45 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_member_struct_passwd_pw_expire=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_member_struct_passwd_pw_expire=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <pwd.h>
-+
-+int
-+main ()
-+{
-+static struct passwd ac_aggr;
-+if (sizeof ac_aggr.pw_expire)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -47587,40 +47325,37 @@
+ }
+ _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;;
@@ -63554,66 +48300,69 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_member_struct_passwd_pw_expire=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_member_struct_passwd_pw_expire=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_member_struct_passwd_pw_expire=no
 +	ac_cv_member_struct_passwd_pw_expire=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
+-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_member_struct_passwd_pw_expire" >&5
+-echo "${ECHO_T}$ac_cv_member_struct_passwd_pw_expire" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_expire" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_passwd_pw_expire" >&6; }
-+if test $ac_cv_member_struct_passwd_pw_expire = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_PASSWD_PW_EXPIRE 1
-+_ACEOF
-+
-+
-+fi
-+
+ if test $ac_cv_member_struct_passwd_pw_expire = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -47630,8 +47365,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for struct sockaddr_in.sin_len" >&5
+-echo $ECHO_N "checking for struct sockaddr_in.sin_len... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for struct sockaddr_in.sin_len" >&5
 +echo $ECHO_N "checking for struct sockaddr_in.sin_len... $ECHO_C" >&6; }
-+if test "${ac_cv_member_struct_sockaddr_in_sin_len+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
-+
-+int
-+main ()
-+{
-+static struct sockaddr_in ac_aggr;
-+if (ac_aggr.sin_len)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_member_struct_sockaddr_in_sin_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47657,33 +47392,28 @@
+ }
+ _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;;
@@ -63621,42 +48370,45 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_member_struct_sockaddr_in_sin_len=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_member_struct_sockaddr_in_sin_len=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
-+
-+int
-+main ()
-+{
-+static struct sockaddr_in ac_aggr;
-+if (sizeof ac_aggr.sin_len)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -47705,40 +47435,37 @@
+ }
+ _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;;
@@ -63664,101 +48416,105 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_member_struct_sockaddr_in_sin_len=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_member_struct_sockaddr_in_sin_len=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_member_struct_sockaddr_in_sin_len=no
 +	ac_cv_member_struct_sockaddr_in_sin_len=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
+-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_member_struct_sockaddr_in_sin_len" >&5
+-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_in_sin_len" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in_sin_len" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_sockaddr_in_sin_len" >&6; }
-+if test $ac_cv_member_struct_sockaddr_in_sin_len = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1
-+_ACEOF
-+
-+
-+fi
-+
-+
-+ac_save_libs=$LIBS
-+LIBS="$LIBS $LIBUTIL"
-+
-+
-+
-+
-+
-+for ac_func in setlogin setusercontext getusershell login_getclass auth_timeok
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ if test $ac_cv_member_struct_sockaddr_in_sin_len = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -47759,9 +47486,9 @@
+ for ac_func in setlogin setusercontext getusershell login_getclass auth_timeok
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -47787,68 +47514,60 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -63766,99 +48522,104 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+LIBS=$ac_save_libs
-+
-+
-+
-+
-+
-+
-+for ac_func in mkstemp setproctitle sysinfo strnlen getifaddrs
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -47867,9 +47586,9 @@
+ for ac_func in mkstemp setproctitle sysinfo strnlen getifaddrs
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -47895,68 +47614,60 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -63866,94 +48627,104 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+
-+for ac_func in arc4random
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -47970,9 +47681,9 @@
+ for ac_func in arc4random
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -47998,68 +47709,60 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -63961,103 +48732,102 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+
-+for i in urandom random; do
-+  if test -c /dev/$i; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define DEV_RANDOM "/dev/$i"
-+_ACEOF
-+
-+    break
-+  fi
-+done
-+
-+fi
-+done
-+
-+
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -48082,8 +47785,8 @@
+ done
+ 
+ 
+-echo "$as_me:$LINENO: checking for vsyslog" >&5
+-echo $ECHO_N "checking for vsyslog... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for vsyslog" >&5
 +echo $ECHO_N "checking for vsyslog... $ECHO_C" >&6; }
-+if test "${ac_cv_func_vsyslog+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define vsyslog to an innocuous variant, in case <limits.h> declares vsyslog.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define vsyslog innocuous_vsyslog
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char vsyslog (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef vsyslog
-+
+ if test "${ac_cv_func_vsyslog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48110,68 +47813,59 @@
+ 
+ #undef vsyslog
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char vsyslog ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 vsyslog ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_vsyslog) || defined (__stub___vsyslog)
 +#if defined __stub_vsyslog || defined __stub___vsyslog
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = vsyslog;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != vsyslog;
 +return vsyslog ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -64065,66 +48835,74 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_vsyslog=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_func_vsyslog=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_vsyslog=no
 +	ac_cv_func_vsyslog=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_vsyslog" >&5
+-echo "${ECHO_T}$ac_cv_func_vsyslog" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_vsyslog" >&5
 +echo "${ECHO_T}$ac_cv_func_vsyslog" >&6; }
-+if test $ac_cv_func_vsyslog = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USE_SYSLOG 1
-+_ACEOF
-+
-+fi
-+
-+
-+kdm_no_Xau=false
-+kdm_no_Xdmcp=false
-+
+ if test $ac_cv_func_vsyslog = yes; then
+ 
+ 
+@@ -48185,8 +47879,8 @@
+ kdm_no_Xau=false
+ kdm_no_Xdmcp=false
+ 
+-echo "$as_me:$LINENO: checking for main in -lXau" >&5
+-echo $ECHO_N "checking for main in -lXau... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for main in -lXau" >&5
 +echo $ECHO_N "checking for main in -lXau... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xau_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXau $X_LDFLAGS -lX11 $LIBSOCKET $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
+ if test "${ac_cv_lib_Xau_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48203,46 +47897,43 @@
+ int
+ main ()
+ {
+-main ();
 +return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -64132,73 +48910,87 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_Xau_main=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xau_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xau_main=no
 +	ac_cv_lib_Xau_main=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xau_main" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_main" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xau_main" >&6; }
-+if test $ac_cv_lib_Xau_main = yes; then
-+  :
-+else
-+
-+	  kdm_no_Xau=true
-+	  DO_NOT_COMPILE="$DO_NOT_COMPILE kdm"
-+
-+fi
-+
-+
-+
+ if test $ac_cv_lib_Xau_main = yes; then
+   :
+ else
+@@ -48254,16 +47945,16 @@
+ 
+ 
+ 
+-# Check whether --with-xdmcp or --without-xdmcp was given.
 +# Check whether --with-xdmcp was given.
-+if test "${with_xdmcp+set}" = set; then
+ if test "${with_xdmcp+set}" = set; then
+-  withval="$with_xdmcp"
+-
 +  withval=$with_xdmcp;
-+else
-+  with_xdmcp=yes
+ else
+   with_xdmcp=yes
+-fi;
 +fi
 +
-+if test "x$with_xdmcp" = xyes; then
+ if test "x$with_xdmcp" = xyes; then
+-  echo "$as_me:$LINENO: checking for main in -lXdmcp" >&5
+-echo $ECHO_N "checking for main in -lXdmcp... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for main in -lXdmcp" >&5
 +echo $ECHO_N "checking for main in -lXdmcp... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xdmcp_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXdmcp $X_LDFLAGS -lX11 $LIBSOCKET $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
+ if test "${ac_cv_lib_Xdmcp_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48280,46 +47971,43 @@
+ int
+ main ()
+ {
+-main ();
 +return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -64206,53 +48998,68 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_Xdmcp_main=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xdmcp_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xdmcp_main=no
 +	ac_cv_lib_Xdmcp_main=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xdmcp_main" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp_main" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xdmcp_main" >&6; }
-+if test $ac_cv_lib_Xdmcp_main = yes; then
-+  LIBXDMCP="-lXdmcp"
-+fi
-+
-+  if test -n "$LIBXDMCP"; then
-+    cppflags_safe=$CPPFLAGS
-+    CPPFLAGS="$CPPFLAGS $X_INCLUDES"
+ if test $ac_cv_lib_Xdmcp_main = yes; then
+   LIBXDMCP="-lXdmcp"
+ fi
+@@ -48327,8 +48015,8 @@
+   if test -n "$LIBXDMCP"; then
+     cppflags_safe=$CPPFLAGS
+     CPPFLAGS="$CPPFLAGS $X_INCLUDES"
+-    echo "$as_me:$LINENO: checking for X11/Xdmcp.h" >&5
+-echo $ECHO_N "checking for X11/Xdmcp.h... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for X11/Xdmcp.h" >&5
 +echo $ECHO_N "checking for X11/Xdmcp.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_Xdmcp_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xmd.h>
-+
-+#include <X11/Xdmcp.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_X11_Xdmcp_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48343,38 +48031,34 @@
+ #include <X11/Xdmcp.h>
+ _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;;
@@ -64260,96 +49067,99 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_X11_Xdmcp_h=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_header_X11_Xdmcp_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_Xdmcp_h=no
 +	ac_cv_header_X11_Xdmcp_h=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_header_X11_Xdmcp_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_Xdmcp_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xdmcp_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_Xdmcp_h" >&6; }
-+if test $ac_cv_header_X11_Xdmcp_h = yes; then
-+  HAVE_X11_XDMCP_H=1
-+fi
-+
-+
-+    CPPFLAGS=$cppflags_safe
-+  fi
-+  if test -z "$HAVE_X11_XDMCP_H"; then
-+    kdm_no_Xdmcp=true
-+    DO_NOT_COMPILE="$DO_NOT_COMPILE kdm"
-+  fi
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define XDMCP 1
-+_ACEOF
-+
-+  ac_save_libs=$LIBS
-+  LIBS="$LIBS $LIBXDMCP"
+ if test $ac_cv_header_X11_Xdmcp_h = yes; then
+   HAVE_X11_XDMCP_H=1
+ fi
+@@ -48393,8 +48077,8 @@
+ 
+   ac_save_libs=$LIBS
+   LIBS="$LIBS $LIBXDMCP"
+-  echo "$as_me:$LINENO: checking for XdmcpWrap" >&5
+-echo $ECHO_N "checking for XdmcpWrap... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for XdmcpWrap" >&5
 +echo $ECHO_N "checking for XdmcpWrap... $ECHO_C" >&6; }
-+if test "${ac_cv_func_XdmcpWrap+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define XdmcpWrap to an innocuous variant, in case <limits.h> declares XdmcpWrap.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define XdmcpWrap innocuous_XdmcpWrap
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char XdmcpWrap (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef XdmcpWrap
-+
+ if test "${ac_cv_func_XdmcpWrap+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48421,68 +48105,59 @@
+ 
+ #undef XdmcpWrap
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XdmcpWrap ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 XdmcpWrap ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_XdmcpWrap) || defined (__stub___XdmcpWrap)
 +#if defined __stub_XdmcpWrap || defined __stub___XdmcpWrap
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = XdmcpWrap;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != XdmcpWrap;
 +return XdmcpWrap ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -64357,106 +49167,123 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_XdmcpWrap=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_func_XdmcpWrap=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_XdmcpWrap=no
 +	ac_cv_func_XdmcpWrap=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_XdmcpWrap" >&5
+-echo "${ECHO_T}$ac_cv_func_XdmcpWrap" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_XdmcpWrap" >&5
 +echo "${ECHO_T}$ac_cv_func_XdmcpWrap" >&6; }
-+if test $ac_cv_func_XdmcpWrap = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HASXDMAUTH 1
-+_ACEOF
-+
-+
-+fi
-+
-+  LIBS=$ac_save_libs
-+fi
-+
-+
-+KRB4_INCS=
-+KRB4_LIBS=
-+KRB4_RPATH=
-+
+ if test $ac_cv_func_XdmcpWrap = yes; then
+ 
+ 
+@@ -48501,25 +48176,25 @@
+ KRB4_LIBS=
+ KRB4_RPATH=
+ 
+-echo "$as_me:$LINENO: checking whether to use Kerberos v4" >&5
+-echo $ECHO_N "checking whether to use Kerberos v4... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether to use Kerberos v4" >&5
 +echo $ECHO_N "checking whether to use Kerberos v4... $ECHO_C" >&6; }
-+
+ 
+-# Check whether --with-krb4 or --without-krb4 was given.
 +# Check whether --with-krb4 was given.
-+if test "${with_krb4+set}" = set; then
+ if test "${with_krb4+set}" = set; then
+-  withval="$with_krb4"
+-   test "x$with_krb4" = xyes && with_krb4=/usr/kerberos
 +  withval=$with_krb4;  test "x$with_krb4" = xyes && with_krb4=/usr/kerberos
-+else
-+   with_krb4=no
-+
+ else
+    with_krb4=no
+ 
+-fi;
 +fi
 +
-+case "$with_krb4" in
-+no)
+ case "$with_krb4" in
+ no)
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+  ;;
-+*)
+   ;;
+ *)
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define KRB4 1
-+_ACEOF
-+
-+  KRB4_INCS="-I$with_krb4/include"
-+  KRB4_LIBS="-L$with_krb4/lib -lkrb -ldes"
-+  if test "$USE_RPATH" = "yes" ; then
-+    KRB4_RPATH="-R $with_krb4/lib"
-+  fi
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define KRB4 1
+@@ -48530,8 +48205,8 @@
+   if test "$USE_RPATH" = "yes" ; then
+     KRB4_RPATH="-R $with_krb4/lib"
+   fi
+-  echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
+-echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
 +echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lresolv  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48544,56 +48219,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dn_expand ();
-+int
-+main ()
-+{
+ #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 dn_expand ();
+ int
+ main ()
+ {
+-dn_expand ();
 +return dn_expand ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -64464,100 +49291,117 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_resolv_dn_expand=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_resolv_dn_expand=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_resolv_dn_expand=no
 +	ac_cv_lib_resolv_dn_expand=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
+-echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
 +echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6; }
-+if test $ac_cv_lib_resolv_dn_expand = yes; then
-+  KRB4_LIBS="$KRB4_LIBS -lresolv"
-+fi
-+
-+  ;;
-+esac
-+
+ if test $ac_cv_lib_resolv_dn_expand = yes; then
+   KRB4_LIBS="$KRB4_LIBS -lresolv"
+ fi
+@@ -48601,29 +48273,29 @@
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking whether to use AFS" >&5
+-echo $ECHO_N "checking whether to use AFS... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether to use AFS" >&5
 +echo $ECHO_N "checking whether to use AFS... $ECHO_C" >&6; }
-+
+ 
+-# Check whether --with-afs or --without-afs was given.
 +# Check whether --with-afs was given.
-+if test "${with_afs+set}" = set; then
+ if test "${with_afs+set}" = set; then
+-  withval="$with_afs"
+-
 +  withval=$with_afs;
-+else
-+   with_afs=no
+ else
+    with_afs=no
+-fi;
 +fi
 +
-+if test "$with_afs" = no; then
+ if test "$with_afs" = no; then
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+else
-+  if test "$with_krb4" = no; then
+ else
+   if test "$with_krb4" = no; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +    { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+    { echo "$as_me:$LINENO: WARNING: \"AFS requires Kerberos v4 support.\"" >&5
-+echo "$as_me: WARNING: \"AFS requires Kerberos v4 support.\"" >&2;}
-+    with_afs=no
-+  else
+     { echo "$as_me:$LINENO: WARNING: \"AFS requires Kerberos v4 support.\"" >&5
+ echo "$as_me: WARNING: \"AFS requires Kerberos v4 support.\"" >&2;}
+     with_afs=no
+   else
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +    { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define AFS 1
-+_ACEOF
-+
-+    KRB4_LIBS="$KRB4_LIBS -lkafs"
-+    if test -n "$os_aix"; then
-+      KRB4_LIBS="$KRB4_LIBS -lld"
-+    fi
-+  fi
-+fi
-+
-+
-+
-+
-+
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define AFS 1
+@@ -48640,8 +48312,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for main in -ls" >&5
+-echo $ECHO_N "checking for main in -ls... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for main in -ls" >&5
 +echo $ECHO_N "checking for main in -ls... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_s_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ls  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
+ if test "${ac_cv_lib_s_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48658,53 +48330,50 @@
+ int
+ main ()
+ {
+-main ();
 +return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -64565,65 +49409,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_s_main=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_s_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_s_main=no
 +	ac_cv_lib_s_main=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_s_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_s_main" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_s_main" >&5
 +echo "${ECHO_T}$ac_cv_lib_s_main" >&6; }
-+if test $ac_cv_lib_s_main = yes; then
-+  LIB_LIBS="-ls"
-+fi
-+
-+
+ if test $ac_cv_lib_s_main = yes; then
+   LIB_LIBS="-ls"
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for sched_yield in -lposix4" >&5
+-echo $ECHO_N "checking for sched_yield in -lposix4... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for sched_yield in -lposix4" >&5
 +echo $ECHO_N "checking for sched_yield in -lposix4... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lposix4  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48717,56 +48386,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char sched_yield ();
-+int
-+main ()
-+{
+ #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 sched_yield ();
+ int
+ main ()
+ {
+-sched_yield ();
 +return sched_yield ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -64631,87 +49496,114 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_posix4_sched_yield=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_posix4_sched_yield=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_posix4_sched_yield=no
 +	ac_cv_lib_posix4_sched_yield=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sched_yield" >&5
+-echo "${ECHO_T}$ac_cv_lib_posix4_sched_yield" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sched_yield" >&5
 +echo "${ECHO_T}$ac_cv_lib_posix4_sched_yield" >&6; }
-+if test $ac_cv_lib_posix4_sched_yield = yes; then
-+  LIBPOSIX4=-lposix4
-+fi
-+
-+
-+
-+KRB5_INCS=
-+KRB5_LIBS=
-+KRB5_RPATH=
-+
+ if test $ac_cv_lib_posix4_sched_yield = yes; then
+   LIBPOSIX4=-lposix4
+ fi
+@@ -48777,22 +48443,22 @@
+ KRB5_LIBS=
+ KRB5_RPATH=
+ 
+-echo "$as_me:$LINENO: checking whether to use Kerberos5 for Xauth cookies in kdm" >&5
+-echo $ECHO_N "checking whether to use Kerberos5 for Xauth cookies in kdm... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether to use Kerberos5 for Xauth cookies in kdm" >&5
 +echo $ECHO_N "checking whether to use Kerberos5 for Xauth cookies in kdm... $ECHO_C" >&6; }
-+
+ 
+-# Check whether --with-krb5auth or --without-krb5auth was given.
 +# Check whether --with-krb5auth was given.
-+if test "${with_krb5auth+set}" = set; then
+ if test "${with_krb5auth+set}" = set; then
+-  withval="$with_krb5auth"
+-
 +  withval=$with_krb5auth;
-+else
-+   with_krb5auth=no
+ else
+    with_krb5auth=no
+-fi;
 +fi
 +
-+if test "x$with_krb5auth" = xno; then
+ if test "x$with_krb5auth" = xno; then
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+  if test "x$with_krb5auth" != xyes; then
-+    KRB5_INCS="-I$with_krb5auth/include"
-+    KRB5_LIBS="-L$with_krb5auth/lib"
-+    if test "$USE_RPATH" = "yes" ; then
-+      KRB5_RPATH="-R $with_krb5auth/lib"
-+    fi
-+  fi
-+  KRB5_LIBS="$KRB5_LIBS -lkrb5"   keepcflags=$CFLAGS
-+  CFLAGS="$KRB5_INCS $CFLAGS"
-+  if test "${ac_cv_header_krb5_krb5_h+set}" = set; then
+   if test "x$with_krb5auth" != xyes; then
+     KRB5_INCS="-I$with_krb5auth/include"
+     KRB5_LIBS="-L$with_krb5auth/lib"
+@@ -48803,17 +48469,17 @@
+   KRB5_LIBS="$KRB5_LIBS -lkrb5"   keepcflags=$CFLAGS
+   CFLAGS="$KRB5_INCS $CFLAGS"
+   if test "${ac_cv_header_krb5_krb5_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for krb5/krb5.h" >&5
+-echo $ECHO_N "checking for krb5/krb5.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for krb5/krb5.h" >&5
 +echo $ECHO_N "checking for krb5/krb5.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_krb5_krb5_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_krb5_krb5_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_krb5_krb5_h" >&5
+-echo "${ECHO_T}$ac_cv_header_krb5_krb5_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_krb5_krb5_h" >&5
 +echo "${ECHO_T}$ac_cv_header_krb5_krb5_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking krb5/krb5.h usability" >&5
+-echo $ECHO_N "checking krb5/krb5.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking krb5/krb5.h usability" >&5
 +echo $ECHO_N "checking krb5/krb5.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <krb5/krb5.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -48824,41 +48490,37 @@
+ #include <krb5/krb5.h>
+ _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;;
@@ -64719,38 +49611,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking krb5/krb5.h presence" >&5
+-echo $ECHO_N "checking krb5/krb5.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking krb5/krb5.h presence" >&5
 +echo $ECHO_N "checking krb5/krb5.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <krb5/krb5.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -48867,24 +48529,22 @@
+ /* end confdefs.h.  */
+ #include <krb5/krb5.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -64758,125 +49671,130 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -48892,9 +48552,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -48918,25 +48579,18 @@
+ echo "$as_me: WARNING: krb5/krb5.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: krb5/krb5.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: krb5/krb5.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb5/krb5.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: krb5/krb5.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: krb5/krb5.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: krb5/krb5.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb5/krb5.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: krb5/krb5.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb5/krb5.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: krb5/krb5.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb5/krb5.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: krb5/krb5.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb5/krb5.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: krb5/krb5.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for krb5/krb5.h" >&5
+-echo $ECHO_N "checking for krb5/krb5.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for krb5/krb5.h" >&5
 +echo $ECHO_N "checking for krb5/krb5.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_krb5_krb5_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_krb5_krb5_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_krb5_krb5_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_krb5_krb5_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_krb5_krb5_h" >&5
+-echo "${ECHO_T}$ac_cv_header_krb5_krb5_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_krb5_krb5_h" >&5
 +echo "${ECHO_T}$ac_cv_header_krb5_krb5_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_krb5_krb5_h = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define K5AUTH 1
-+_ACEOF
-+
-+else
-+   { { echo "$as_me:$LINENO: error: --with-krb5auth requires Kerberos5 header files.
-+Due to a problem with X includes you probably have to run \"ln -s . krb5\"
-+in the directory where the krb5.h include resides to make things actually work." >&5
-+echo "$as_me: error: --with-krb5auth requires Kerberos5 header files.
-+Due to a problem with X includes you probably have to run \"ln -s . krb5\"
-+in the directory where the krb5.h include resides to make things actually work." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+  CFLAGS="$keepcflags"
-+fi
-+
-+
-+
-+
-+
+ 
+ fi
+ if test $ac_cv_header_krb5_krb5_h = yes; then
+@@ -48963,34 +48617,34 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether to use Sun's secure RPC for Xauth cookies in kdm" >&5
+-echo $ECHO_N "checking whether to use Sun's secure RPC for Xauth cookies in kdm... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether to use Sun's secure RPC for Xauth cookies in kdm" >&5
 +echo $ECHO_N "checking whether to use Sun's secure RPC for Xauth cookies in kdm... $ECHO_C" >&6; }
-+
+ 
+-# Check whether --with-rpcauth or --without-rpcauth was given.
 +# Check whether --with-rpcauth was given.
-+if test "${with_rpcauth+set}" = set; then
+ if test "${with_rpcauth+set}" = set; then
+-  withval="$with_rpcauth"
+-
 +  withval=$with_rpcauth;
-+else
-+   with_rpcauth=no
+ else
+    with_rpcauth=no
+-fi;
 +fi
 +
-+if test "x$with_rpcauth" = xno; then
+ if test "x$with_rpcauth" = xno; then
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+  if test "${ac_cv_header_rpc_rpc_h+set}" = set; then
+   if test "${ac_cv_header_rpc_rpc_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for rpc/rpc.h" >&5
+-echo $ECHO_N "checking for rpc/rpc.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for rpc/rpc.h" >&5
 +echo $ECHO_N "checking for rpc/rpc.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_rpc_rpc_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_rpc_rpc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_rpc_rpc_h" >&5
+-echo "${ECHO_T}$ac_cv_header_rpc_rpc_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_rpc_rpc_h" >&5
 +echo "${ECHO_T}$ac_cv_header_rpc_rpc_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking rpc/rpc.h usability" >&5
+-echo $ECHO_N "checking rpc/rpc.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking rpc/rpc.h usability" >&5
 +echo $ECHO_N "checking rpc/rpc.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <rpc/rpc.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -49001,41 +48655,37 @@
+ #include <rpc/rpc.h>
+ _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;;
@@ -64884,38 +49802,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking rpc/rpc.h presence" >&5
+-echo $ECHO_N "checking rpc/rpc.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking rpc/rpc.h presence" >&5
 +echo $ECHO_N "checking rpc/rpc.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <rpc/rpc.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -49044,24 +48694,22 @@
+ /* end confdefs.h.  */
+ #include <rpc/rpc.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -64923,174 +49862,117 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -49069,9 +48717,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -49095,25 +48744,18 @@
+ echo "$as_me: WARNING: rpc/rpc.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: rpc/rpc.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: rpc/rpc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rpc/rpc.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: rpc/rpc.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: rpc/rpc.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: rpc/rpc.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rpc/rpc.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: rpc/rpc.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rpc/rpc.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: rpc/rpc.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rpc/rpc.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: rpc/rpc.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rpc/rpc.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: rpc/rpc.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for rpc/rpc.h" >&5
+-echo $ECHO_N "checking for rpc/rpc.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for rpc/rpc.h" >&5
 +echo $ECHO_N "checking for rpc/rpc.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_rpc_rpc_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_rpc_rpc_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_rpc_rpc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_rpc_rpc_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_rpc_rpc_h" >&5
+-echo "${ECHO_T}$ac_cv_header_rpc_rpc_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_rpc_rpc_h" >&5
 +echo "${ECHO_T}$ac_cv_header_rpc_rpc_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_rpc_rpc_h = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define SECURE_RPC 1
-+_ACEOF
-+
-+else
-+   { { echo "$as_me:$LINENO: error: --with-rpcauth requires Sun RPC header files." >&5
-+echo "$as_me: error: --with-rpcauth requires Sun RPC header files." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+fi
-+
-+if test "x$use_pam" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USE_PAM 1
-+_ACEOF
-+
-+elif test "x$use_shadow" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USESHADOW 1
-+_ACEOF
-+
-+fi
-+if test "x$with_krb4" != xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define KERBEROS 1
-+_ACEOF
-+
-+    if test "x$with_afs" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define NO_AFS 1
-+_ACEOF
-+
-+    fi
-+fi
-+
-+
+ 
+ fi
+ if test $ac_cv_header_rpc_rpc_h = yes; then
+@@ -49160,13 +48802,13 @@
+ fi
+ 
+ 
+-# Check whether --with-kdm-xconsole or --without-kdm-xconsole was given.
 +# Check whether --with-kdm-xconsole was given.
-+if test "${with_kdm_xconsole+set}" = set; then
+ if test "${with_kdm_xconsole+set}" = set; then
+-  withval="$with_kdm_xconsole"
+-
 +  withval=$with_kdm_xconsole;
-+else
-+  with_kdm_xconsole=no
+ else
+   with_kdm_xconsole=no
+-fi;
 +fi
 +
-+if test "x$with_kdm_xconsole" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define WITH_KDM_XCONSOLE 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
+ if test "x$with_kdm_xconsole" = xyes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -49178,16 +48820,15 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking if covariant return works" >&5
+-echo $ECHO_N "checking if covariant return works... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if covariant return works" >&5
 +echo $ECHO_N "checking if covariant return works... $ECHO_C" >&6; }
-+if test "${kde_cv_covariant_return+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    kde_cv_covariant_return=no
-+
+ if test "${kde_cv_covariant_return+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     kde_cv_covariant_return=no
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    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.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+        class A { public: virtual A* me(); };
-+        class X { public: int x; virtual void ff() {}; };
-+        class B : public X, public A { public: virtual B* me(); };
-+        int foo( A* a )
-+            {
-+            A* aa = a->me();
-+            return a == aa;
-+            }
-+        int main()
-+            {
-+            B* b = new B;
-+            return foo( b ) == 0;
-+            }
-+        A* A::me() { return this; }
-+        B* B::me() { return this; }
-+
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 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'
+@@ -49228,13 +48869,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -65098,151 +49980,135 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+   kde_cv_covariant_return=yes
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -49245,8 +48895,10 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
 +
 +
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
-+if test "$kde_cv_covariant_return" = "no"; then
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -49258,16 +48910,16 @@
+ 
+ 
+ if test "$kde_cv_covariant_return" = "no"; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +    { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define COVARIANT_RETURN_BROKEN 1
-+_ACEOF
-+
-+else
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define COVARIANT_RETURN_BROKEN 1
+ _ACEOF
+ 
+ else
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +    { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+fi
-+
-+
-+
-+
-+artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
-+# Extract the first word of "artsc-config", so it can be a program name with args.
-+set dummy artsc-config; ac_word=$2
+ fi
+ 
+ 
+@@ -49276,8 +48928,8 @@
+ artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
+ # Extract the first word of "artsc-config", so it can be a program name with args.
+ set dummy artsc-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $ARTSCCONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_ARTSCCONFIG="$ARTSCCONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $artsc_config_test_path
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -49292,29 +48944,30 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_ARTSCCONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+     ac_cv_path_ARTSCCONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_ARTSCCONFIG" && ac_cv_path_ARTSCCONFIG="no"
-+  ;;
-+esac
-+fi
-+ARTSCCONFIG=$ac_cv_path_ARTSCCONFIG
-+if test -n "$ARTSCCONFIG"; then
+ 
+   test -z "$ac_cv_path_ARTSCCONFIG" && ac_cv_path_ARTSCCONFIG="no"
+   ;;
+ esac
+ fi
+ ARTSCCONFIG=$ac_cv_path_ARTSCCONFIG
+-
+ if test -n "$ARTSCCONFIG"; then
+-  echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
+-echo "${ECHO_T}$ARTSCCONFIG" >&6
 +  { echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
 +echo "${ECHO_T}$ARTSCCONFIG" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
+ 
 +
-+
-+
-+if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
-+	LIB_ARTS="-lartskde"
-+	ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix`
-+	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_ARTS 1
-+_ACEOF
-+
-+        KHOTKEYS_ARTS_SUBDIR=arts
-+else
-+	LIB_ARTS=""
-+	ARTS_CFLAGS=""
-+        KHOTKEYS_ARTS_SUBDIR=
-+fi
-+
-+
-+
-+
-+
-+case "$host" in
-+  *-*-freebsd*) LIB_KVM="-lkvm" ;;
-+  *) LIB_KVM=""  ;;
-+esac
-+
-+
-+
-+for ac_header in sys/loadavg.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
+ 	LIB_ARTS="-lartskde"
+ 	ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix`
+@@ -49345,18 +48998,19 @@
+ for ac_header in sys/loadavg.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -49367,41 +49021,37 @@
+ #include <$ac_header>
+ _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;;
@@ -65250,38 +50116,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -49410,24 +49060,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -65289,104 +50176,102 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -49435,9 +49083,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -49461,25 +49110,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+if test "x$with_composite" != "xno"; then
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -49497,8 +49140,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
+ 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'
+@@ -49507,8 +49149,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/Xcomposite.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xcomposite.h... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for X11/extensions/Xcomposite.h" >&5
 +echo $ECHO_N "checking for X11/extensions/Xcomposite.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_Xcomposite_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+
-+#include <X11/extensions/Xcomposite.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_X11_extensions_Xcomposite_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -49523,38 +49165,34 @@
+ #include <X11/extensions/Xcomposite.h>
+ _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;;
@@ -65394,82 +50279,85 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_X11_extensions_Xcomposite_h=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_header_X11_extensions_Xcomposite_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_Xcomposite_h=no
 +	ac_cv_header_X11_extensions_Xcomposite_h=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_header_X11_extensions_Xcomposite_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xcomposite_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xcomposite_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xcomposite_h" >&6; }
-+if test $ac_cv_header_X11_extensions_Xcomposite_h = yes; then
-+  xcomposite_h=yes
-+else
-+  xcomposite_h=no
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+  if test "$xcomposite_h" = yes; then
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
+ if test $ac_cv_header_X11_extensions_Xcomposite_h = yes; then
+   xcomposite_h=yes
+ else
+@@ -49580,8 +49218,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XCompositeQueryExtension in -lXcomposite" >&5
+-echo $ECHO_N "checking for XCompositeQueryExtension in -lXcomposite... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for XCompositeQueryExtension in -lXcomposite" >&5
 +echo $ECHO_N "checking for XCompositeQueryExtension in -lXcomposite... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXcomposite -lXext -lX11 $X_EXTRA_LIBS $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -49594,56 +49232,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XCompositeQueryExtension ();
-+int
-+main ()
-+{
+ #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 XCompositeQueryExtension ();
+ int
+ main ()
+ {
+-XCompositeQueryExtension ();
 +return XCompositeQueryExtension ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -65477,78 +50365,78 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_Xcomposite_XCompositeQueryExtension=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xcomposite_XCompositeQueryExtension=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xcomposite_XCompositeQueryExtension=no
 +	ac_cv_lib_Xcomposite_XCompositeQueryExtension=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&6; }
-+if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then
-+  LIB_XCOMPOSITE=-lXcomposite
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_XCOMPOSITE 1
-+_ACEOF
-+
-+
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+  else
-+    LIB_XCOMPOSITE=
-+  fi
-+
-+fi
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then
+   LIB_XCOMPOSITE=-lXcomposite
+ 
+@@ -49667,8 +49302,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
+ 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'
+@@ -49677,8 +49311,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/Xfixes.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xfixes.h... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for X11/extensions/Xfixes.h" >&5
 +echo $ECHO_N "checking for X11/extensions/Xfixes.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+
-+#include <X11/extensions/Xfixes.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -49693,38 +49327,34 @@
+ #include <X11/extensions/Xfixes.h>
+ _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;;
@@ -65556,82 +50444,85 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_X11_extensions_Xfixes_h=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_header_X11_extensions_Xfixes_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_Xfixes_h=no
 +	ac_cv_header_X11_extensions_Xfixes_h=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_header_X11_extensions_Xfixes_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xfixes_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xfixes_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xfixes_h" >&6; }
-+if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then
-+  xfixes_h=yes
-+else
-+  xfixes_h=no
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+if test "$xfixes_h" = yes; then
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
+ if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then
+   xfixes_h=yes
+ else
+@@ -49750,8 +49380,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XFixesQueryExtension in -lXfixes" >&5
+-echo $ECHO_N "checking for XFixesQueryExtension in -lXfixes... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for XFixesQueryExtension in -lXfixes" >&5
 +echo $ECHO_N "checking for XFixesQueryExtension in -lXfixes... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXfixes -lXext -lX11 $X_EXTRA_LIBS $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -49764,56 +49394,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XFixesQueryExtension ();
-+int
-+main ()
-+{
+ #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 XFixesQueryExtension ();
+ int
+ main ()
+ {
+-XFixesQueryExtension ();
 +return XFixesQueryExtension ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -65639,137 +50530,103 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_Xfixes_XFixesQueryExtension=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xfixes_XFixesQueryExtension=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xfixes_XFixesQueryExtension=no
 +	ac_cv_lib_Xfixes_XFixesQueryExtension=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xfixes_XFixesQueryExtension" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xfixes_XFixesQueryExtension" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xfixes_XFixesQueryExtension" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xfixes_XFixesQueryExtension" >&6; }
-+if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then
-+  LIB_XFIXES=-lXfixes
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_XFIXES 1
-+_ACEOF
-+
-+
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+else
-+  LIB_XFIXES=
-+fi
-+
-+
-+
-+LIBSSL="-lssl -lcrypto"
-+
-+
-+ac_ssl_includes=NO ac_ssl_libraries=NO
-+ssl_libraries=""
-+ssl_includes=""
-+
+ if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then
+   LIB_XFIXES=-lXfixes
+ 
+@@ -49840,26 +49467,26 @@
+ ssl_libraries=""
+ ssl_includes=""
+ 
+-# Check whether --with-ssl-dir or --without-ssl-dir was given.
 +# Check whether --with-ssl-dir was given.
-+if test "${with_ssl_dir+set}" = set; then
+ if test "${with_ssl_dir+set}" = set; then
+-  withval="$with_ssl_dir"
+-    ac_ssl_includes="$withval"/include
 +  withval=$with_ssl_dir;   ac_ssl_includes="$withval"/include
-+       ac_ssl_libraries="$withval"/lib$kdelibsuff
-+
+        ac_ssl_libraries="$withval"/lib$kdelibsuff
+ 
+-fi;
 +fi
 +
-+
-+want_ssl=yes
-+
+ 
+ want_ssl=yes
+ 
+-# Check whether --with-ssl or --without-ssl was given.
 +# Check whether --with-ssl was given.
-+if test "${with_ssl+set}" = set; then
+ if test "${with_ssl+set}" = set; then
+-  withval="$with_ssl"
+-  want_ssl=$withval
+-fi;
 +  withval=$with_ssl; want_ssl=$withval
 +fi
 +
-+
-+if test $want_ssl = yes; then
-+
+ 
+ if test $want_ssl = yes; then
+ 
+-echo "$as_me:$LINENO: checking for OpenSSL" >&5
+-echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for OpenSSL" >&5
 +echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6; }
-+
-+if test "${ac_cv_have_ssl+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  #try to guess OpenSSL locations
-+
-+  ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes"
-+  ssl_incdirs="$ac_ssl_includes $ssl_incdirs"
-+
-+ssl_incdir=NO
-+for i in $ssl_incdirs;
-+do
-+  for j in openssl/ssl.h;
-+  do
+ 
+ if test "${ac_cv_have_ssl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -49874,7 +49501,7 @@
+ do
+   for j in openssl/ssl.h;
+   do
+-    echo "configure: 49877: $i/$j" >&5
 +    echo "configure: 49504: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      ssl_incdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+  ac_ssl_includes="$ssl_incdir"
-+
-+  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
-+  if test ! "$ac_ssl_libraries" = "NO"; then
-+    ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
-+  fi
-+
-+  test=NONE
-+  ssl_libdir=NONE
-+  for dir in $ssl_libdirs; do
-+    try="ls -1 $dir/libssl*"
-+    if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
-+  done
-+
-+  ac_ssl_libraries="$ssl_libdir"
-+
-+  ac_ldflags_safe="$LDFLAGS"
-+  ac_libs_safe="$LIBS"
-+
-+  LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries"
-+  LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref"
-+
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+void RSAPrivateEncrypt(void);RSAPrivateEncrypt();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       ssl_incdir=$i
+@@ -49921,37 +49548,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -65777,47 +50634,64 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_ssl_rsaref="yes"
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_ssl_rsaref="yes"
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_ssl_rsaref="no"
 +	ac_ssl_rsaref="no"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+
-+  LDFLAGS="$ac_ldflags_safe"
-+  LIBS="$ac_libs_safe"
-+
-+  if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then
-+    have_ssl=no
-+  else
-+    have_ssl=yes;
-+  fi
-+
-+
-+fi
-+
-+
-+  eval "$ac_cv_have_ssl"
-+
+       conftest$ac_exeext conftest.$ac_ext
+ 
+   LDFLAGS="$ac_ldflags_safe"
+@@ -49969,26 +49593,26 @@
+ 
+   eval "$ac_cv_have_ssl"
+ 
+-  echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
+-echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6
 +  { echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
 +echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6; }
-+
+ 
+-  echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
+-echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
+-echo "${ECHO_T}$ac_ssl_rsaref" >&6
+-
+-  echo "$as_me:$LINENO: checking for easter eggs" >&5
+-echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: none found" >&5
+-echo "${ECHO_T}none found" >&6
 +  { echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
 +echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
@@ -65827,184 +50701,76 @@
 +echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6; }
 +  { echo "$as_me:$LINENO: result: none found" >&5
 +echo "${ECHO_T}none found" >&6; }
-+
-+else
-+  have_ssl=no
-+fi
-+
-+if test "$have_ssl" = yes; then
+ 
+ else
+   have_ssl=no
+ fi
+ 
+ if test "$have_ssl" = yes; then
+-  echo "$as_me:$LINENO: checking for OpenSSL version" >&5
+-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for OpenSSL version" >&5
 +echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; }
-+    if test "${ac_cv_ssl_version+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+    cat >conftest.$ac_ext <<EOF
-+#include <openssl/opensslv.h>
-+#include <stdio.h>
-+    int main() {
-+
-+#ifndef OPENSSL_VERSION_NUMBER
-+      printf("ssl_version=\\"error\\"\n");
-+#else
-+      if (OPENSSL_VERSION_NUMBER < 0x00906000)
-+        printf("ssl_version=\\"old\\"\n");
-+      else
-+        printf("ssl_version=\\"ok\\"\n");
-+#endif
-+     return (0);
-+    }
-+EOF
-+
-+    ac_save_CPPFLAGS=$CPPFLAGS
-+    if test "$ac_ssl_includes" != "/usr/include"; then
-+        CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes"
-+    fi
-+
-+    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+
-+      if eval `./conftest 2>&5`; then
-+        if test $ssl_version = error; then
-+          { { echo "$as_me:$LINENO: error: $ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !" >&5
-+echo "$as_me: error: $ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !" >&2;}
-+   { (exit 1); exit 1; }; }
-+        else
-+          if test $ssl_version = old; then
-+            { echo "$as_me:$LINENO: WARNING: OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled." >&5
-+echo "$as_me: WARNING: OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled." >&2;}
-+            have_ssl=no
-+          fi
-+        fi
-+        ac_cv_ssl_version="ssl_version=$ssl_version"
-+      else
-+        { { echo "$as_me:$LINENO: error: Your system couldn't run a small SSL test program.
-+        Check config.log, and if you can't figure it out, send a mail to
-+        David Faure <faure at kde.org>, attaching your config.log" >&5
-+echo "$as_me: error: Your system couldn't run a small SSL test program.
-+        Check config.log, and if you can't figure it out, send a mail to
-+        David Faure <faure at kde.org>, attaching your config.log" >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+
-+    else
-+      { { echo "$as_me:$LINENO: error: Your system couldn't link a small SSL test program.
-+      Check config.log, and if you can't figure it out, send a mail to
-+      David Faure <faure at kde.org>, attaching your config.log" >&5
-+echo "$as_me: error: Your system couldn't link a small SSL test program.
-+      Check config.log, and if you can't figure it out, send a mail to
-+      David Faure <faure at kde.org>, attaching your config.log" >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+    CPPFLAGS=$ac_save_CPPFLAGS
-+
-+
-+fi
-+
-+
-+  eval "$ac_cv_ssl_version"
+     if test "${ac_cv_ssl_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -50061,8 +49685,8 @@
+ 
+ 
+   eval "$ac_cv_ssl_version"
+-  echo "$as_me:$LINENO: result: $ssl_version" >&5
+-echo "${ECHO_T}$ssl_version" >&6
 +  { echo "$as_me:$LINENO: result: $ssl_version" >&5
 +echo "${ECHO_T}$ssl_version" >&6; }
-+fi
-+
-+if test "$have_ssl" != yes; then
-+  LIBSSL="";
-+else
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_SSL 1
-+_ACEOF
-+
-+  ac_cv_have_ssl="have_ssl=yes \
-+    ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref"
-+
-+
-+  ssl_libraries="$ac_ssl_libraries"
-+  ssl_includes="$ac_ssl_includes"
-+
-+  if test "$ac_ssl_rsaref" = yes; then
-+    LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref"
-+  fi
-+
-+  if test $ssl_version = "old"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_OLD_SSL_API 1
-+_ACEOF
-+
-+  fi
-+fi
-+
-+SSL_INCLUDES=
-+
-+if test "$ssl_includes" = "/usr/include"; then
-+  if test -f /usr/kerberos/include/krb5.h; then
-+	SSL_INCLUDES="-I/usr/kerberos/include"
-+  fi
-+elif test  "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then
-+  SSL_INCLUDES="-I$ssl_includes"
-+fi
-+
-+if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then
-+ SSL_LDFLAGS=""
-+else
-+ SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
-+fi
-+
-+
-+
-+
-+
-+
-+sasl2_header="no"
-+SASL2_LIBS=""
-+
-+
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
+ fi
+ 
+ if test "$have_ssl" != yes; then
+@@ -50121,10 +49745,9 @@
+ 
+ 
+ 
+-
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+
-+for ac_header in sasl.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 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'
+@@ -50137,18 +49760,19 @@
+ for ac_header in sasl.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -50159,41 +49783,37 @@
+ #include <$ac_header>
+ _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;;
@@ -66012,38 +50778,59 @@
 +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
+   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_cxx_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_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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -50202,24 +49822,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -66051,122 +50838,121 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -50227,9 +49845,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -50253,25 +49872,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -50294,10 +49907,9 @@
+ 
+ 
+ 
+-
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+
-+for ac_header in sasl/sasl.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 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'
+@@ -50310,18 +49922,19 @@
+ for ac_header in sasl/sasl.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -50332,41 +49945,37 @@
+ #include <$ac_header>
+ _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;;
@@ -66174,38 +50960,59 @@
 +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
+   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_cxx_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_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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -50375,24 +49984,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -66213,121 +51020,128 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -50400,9 +50007,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -50426,25 +50034,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ sasl2_header="yes"
-+fi
-+
-+done
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+if test "$sasl2_header" = "yes" ; then
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -50474,8 +50076,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5
+-echo $ECHO_N "checking for sasl_client_init in -lsasl2... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5
 +echo $ECHO_N "checking for sasl_client_init in -lsasl2... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsasl2  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -50488,56 +50090,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char sasl_client_init ();
-+int
-+main ()
-+{
+ #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 sasl_client_init ();
+ int
+ main ()
+ {
+-sasl_client_init ();
 +return sasl_client_init ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -66335,88 +51149,63 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $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_sasl2_sasl_client_init=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_sasl2_sasl_client_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_sasl2_sasl_client_init=no
 +	ac_cv_lib_sasl2_sasl_client_init=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_client_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_client_init" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_client_init" >&5
 +echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_client_init" >&6; }
-+if test $ac_cv_lib_sasl2_sasl_client_init = yes; then
-+  SASL2_LIBS="-lsasl2"
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+fi
-+
-+if test "x$SASL2_LIBS" != "x" ; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSASL2 1
-+_ACEOF
-+
-+fi
-+
-+
-+
+ if test $ac_cv_lib_sasl2_sasl_client_init = yes; then
+   SASL2_LIBS="-lsasl2"
+ fi
+@@ -50557,15 +50156,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for bzDecompress in libbz2" >&5
+-echo $ECHO_N "checking for bzDecompress in libbz2... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for bzDecompress in libbz2" >&5
 +echo $ECHO_N "checking for bzDecompress in libbz2... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_bzip2+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${ac_cv_lib_bzip2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
 + ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+kde_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET"
-+kde_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#define BZ_NO_STDIO
-+#include<bzlib.h>
-+
-+int
-+main ()
-+{
-+ bz_stream s; (void) bzDecompress(&s);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -50597,35 +50195,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -66424,85 +51213,82 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
-+  eval "ac_cv_lib_bzip2='-lbz2'"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   eval "ac_cv_lib_bzip2='-lbz2'"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_bzip2=no"
 +	eval "ac_cv_lib_bzip2=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS="$kde_save_LIBS"
-+CXXFLAGS="$kde_save_CXXFLAGS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+ CXXFLAGS="$kde_save_CXXFLAGS"
+@@ -50637,8 +50232,8 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2" >&5
+-echo "${ECHO_T}$ac_cv_lib_bzip2" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2" >&5
 +echo "${ECHO_T}$ac_cv_lib_bzip2" >&6; }
-+
-+if test ! "$ac_cv_lib_bzip2" = no; then
-+  BZIP2DIR=bzip2
-+
-+  LIBBZ2="$ac_cv_lib_bzip2"
-+
-+
-+else
-+
-+   cxx_shared_flag=
-+   ld_shared_flag=
-+
+ 
+ if test ! "$ac_cv_lib_bzip2" = no; then
+   BZIP2DIR=bzip2
+@@ -50651,16 +50246,15 @@
+    cxx_shared_flag=
+    ld_shared_flag=
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
+-echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
 +echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6; }
-+kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -shared"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -50687,34 +50281,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -66510,86 +51296,88 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -50727,30 +50319,29 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+
-+	ld_shared_flag="-shared"
-+
-+else
+  :
+ 
+ 	ld_shared_flag="-shared"
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fPIC" >&5
+-echo $ECHO_N "checking whether $CXX supports -fPIC... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fPIC" >&5
 +echo $ECHO_N "checking whether $CXX supports -fPIC... $ECHO_C" >&6; }
-+kde_cache=`echo fPIC | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo fPIC | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -fPIC"
-+  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;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -50777,34 +50368,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -66597,91 +51385,86 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -50817,29 +50406,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
-+
-+        cxx_shared_flag="-fPIC"
-+
-+else
+  :
+ 
+         cxx_shared_flag="-fPIC"
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
-+
-+fi
-+
-+
+  :
+ 
+ fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for BZ2_bzDecompress in (shared) libbz2" >&5
+-echo $ECHO_N "checking for BZ2_bzDecompress in (shared) libbz2... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for BZ2_bzDecompress in (shared) libbz2" >&5
 +echo $ECHO_N "checking for BZ2_bzDecompress in (shared) libbz2... $ECHO_C" >&6; }
-+   if test "${ac_cv_lib_bzip2_prefix+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+    if test "${ac_cv_lib_bzip2_prefix+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+   kde_save_LIBS="$LIBS"
-+   LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET"
-+   kde_save_CXXFLAGS="$CXXFLAGS"
-+   CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES"
-+
-+   cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+   #define BZ_NO_STDIO
-+   #include<bzlib.h>
-+
-+int
-+main ()
-+{
-+ bz_stream s; (void) BZ2_bzDecompress(&s);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -50872,35 +50460,32 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -66689,102 +51472,89 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
-+  eval "ac_cv_lib_bzip2_prefix='-lbz2'"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   eval "ac_cv_lib_bzip2_prefix='-lbz2'"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_bzip2_prefix=no"
 +	eval "ac_cv_lib_bzip2_prefix=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+   LIBS="$kde_save_LIBS"
-+   CXXFLAGS="$kde_save_CXXFLAGS"
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
+       conftest$ac_exeext conftest.$ac_ext
+    LIBS="$kde_save_LIBS"
+    CXXFLAGS="$kde_save_CXXFLAGS"
+@@ -50913,8 +50498,8 @@
+ 
+ fi
+ 
+-   echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2_prefix" >&5
+-echo "${ECHO_T}$ac_cv_lib_bzip2_prefix" >&6
 +   { echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2_prefix" >&5
 +echo "${ECHO_T}$ac_cv_lib_bzip2_prefix" >&6; }
-+
-+   if test ! "$ac_cv_lib_bzip2_prefix" = no; then
-+     BZIP2DIR=bzip2
-+
-+     LIBBZ2="$ac_cv_lib_bzip2_prefix"
-+
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define NEED_BZ2_PREFIX 1
-+_ACEOF
-+
-+      fi
-+
-+fi
-+
-+
-+if test -n "$BZIP2DIR"; then
-+  include_BZIP2_TRUE=
-+  include_BZIP2_FALSE='#'
-+else
-+  include_BZIP2_TRUE='#'
-+  include_BZIP2_FALSE=
-+fi
-+
-+
-+
-+CFLAGS="$CFLAGS -D_GNU_SOURCE"
-+CXXFLAGS="$CXXFLAGS -D_GNU_SOURCE"
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_header in termios.h pty.h libutil.h util.h sys/types.h sys/ioctl.h stropts.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 
+    if test ! "$ac_cv_lib_bzip2_prefix" = no; then
+      BZIP2DIR=bzip2
+@@ -50955,18 +50540,19 @@
+ for ac_header in termios.h pty.h libutil.h util.h sys/types.h sys/ioctl.h stropts.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -50977,41 +50563,37 @@
+ #include <$ac_header>
+ _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;;
@@ -66792,38 +51562,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -51020,24 +50602,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -66831,133 +51622,128 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -51045,9 +50625,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -51071,25 +50652,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+kde_save_LIBS="$LIBS"
-+LIBS="$LIBS $LIBUTIL"
-+
-+
-+
-+for ac_func in getpt openpty isastream
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -51110,9 +50685,9 @@
+ for ac_func in getpt openpty isastream
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -51138,68 +50713,60 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -66965,174 +51751,172 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+LIBS="$kde_save_LIBS"
-+
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -51210,13 +50777,12 @@
+ 
+ LIBS="$kde_save_LIBS"
+ 
+-echo "$as_me:$LINENO: checking for LDAP support" >&5
+-echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for LDAP support" >&5
 +echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; }
-+
+ 
+-# Check whether --with-ldap or --without-ldap was given.
 +# Check whether --with-ldap was given.
-+if test "${with_ldap+set}" = set; then
+ if test "${with_ldap+set}" = set; then
+-  withval="$with_ldap"
+-   case "$withval" in
 +  withval=$with_ldap;  case "$withval" in
-+  yes)
-+    with_ldap=CHECK
-+    ;;
-+  esac
-+else
-+   with_ldap=CHECK
-+
+   yes)
+     with_ldap=CHECK
+     ;;
+@@ -51224,7 +50790,8 @@
+ else
+    with_ldap=CHECK
+ 
+-fi;
 +fi
 +
-+if test "x$with_ldap" = "xCHECK" ; then
-+  with_ldap=NOTFOUND
-+  search_incs="$kde_includes /usr/include /usr/local/include"
-+
-+ldap_incdir=NO
-+for i in $search_incs;
-+do
-+  for j in ldap.h;
-+  do
+ if test "x$with_ldap" = "xCHECK" ; then
+   with_ldap=NOTFOUND
+   search_incs="$kde_includes /usr/include /usr/local/include"
+@@ -51234,7 +50801,7 @@
+ do
+   for j in ldap.h;
+   do
+-    echo "configure: 51237: $i/$j" >&5
 +    echo "configure: 50804: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      ldap_incdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+  if test -r $ldap_incdir/ldap.h ; then
-+    test "x$ldap_incdir" != "x/usr/include" && LDAP_INCS="-I$ldap_incdir"
-+    with_ldap=FOUND
-+  fi
-+  if test $with_ldap = FOUND ; then
-+    with_ldap=NOTFOUND
-+    for ext in la so sl a dylib ; do
-+
-+ldap_libdir=NO
-+for i in $kde_libraries /usr/lib /usr/local/lib /usr/lib64;
-+do
-+  for j in libldap.$ext;
-+  do
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       ldap_incdir=$i
+@@ -51256,7 +50823,7 @@
+ do
+   for j in libldap.$ext;
+   do
+-    echo "configure: 51259: $i/$j" >&5
 +    echo "configure: 50826: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      ldap_libdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+      if test -r $ldap_libdir/libldap.$ext ; then
-+        if test "x$ldap_libdir" != "x/usr/lib" ; then
-+          LDAP_LIBS="-L$ldap_libdir "
-+          test "$USE_RPATH" = yes && LDAP_RPATH="-R $ldap_libdir"
-+        fi
-+        LDAP_LIBS="${LDAP_LIBS}-lldap"
-+        with_ldap=FOUND
-+        break
-+      fi
-+    done
-+  fi
-+fi
-+
-+case "$with_ldap" in
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       ldap_libdir=$i
+@@ -51279,8 +50846,8 @@
+ fi
+ 
+ case "$with_ldap" in
+-no) echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6 ;;
 +no) { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; } ;;
-+framework)
-+  LDAP_LIBS="-Xlinker -framework -Xlinker LDAP"
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBLDAP 1
-+_ACEOF
-+
-+  LDAP_SUBDIR="ldap"
+ framework)
+   LDAP_LIBS="-Xlinker -framework -Xlinker LDAP"
+ 
+@@ -51289,18 +50856,18 @@
+ _ACEOF
+ 
+   LDAP_SUBDIR="ldap"
+-  echo "$as_me:$LINENO: result: Apple framework" >&5
+-echo "${ECHO_T}Apple framework" >&6
 +  { echo "$as_me:$LINENO: result: Apple framework" >&5
 +echo "${ECHO_T}Apple framework" >&6; }
-+  ;;
-+FOUND)
+   ;;
+ FOUND)
+-  echo "$as_me:$LINENO: result: incs=$ldap_incdir libs=$ldap_libdir" >&5
+-echo "${ECHO_T}incs=$ldap_incdir libs=$ldap_libdir" >&6
 +  { echo "$as_me:$LINENO: result: incs=$ldap_incdir libs=$ldap_libdir" >&5
 +echo "${ECHO_T}incs=$ldap_incdir libs=$ldap_libdir" >&6; }
-+  ;;
+   ;;
+-NOTFOUND) echo "$as_me:$LINENO: result: searched but not found" >&5
+-echo "${ECHO_T}searched but not found" >&6 ;;
 +NOTFOUND) { echo "$as_me:$LINENO: result: searched but not found" >&5
 +echo "${ECHO_T}searched but not found" >&6; } ;;
-+*)
+ *)
+-  echo "$as_me:$LINENO: result: $with_ldap" >&5
+-echo "${ECHO_T}$with_ldap" >&6
 +  { echo "$as_me:$LINENO: result: $with_ldap" >&5
 +echo "${ECHO_T}$with_ldap" >&6; }
-+  ;;
-+esac
-+
-+LIB_LBER=
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
+   ;;
+ esac
+ 
+@@ -51314,8 +50881,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for ber_alloc in -llber" >&5
+-echo $ECHO_N "checking for ber_alloc in -llber... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for ber_alloc in -llber" >&5
 +echo $ECHO_N "checking for ber_alloc in -llber... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_lber_ber_alloc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-llber -L$ldap_libdir $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_lber_ber_alloc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -51328,56 +50895,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char ber_alloc ();
-+int
-+main ()
-+{
+ #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 ber_alloc ();
+ int
+ main ()
+ {
+-ber_alloc ();
 +return ber_alloc ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -67140,89 +51924,76 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_lber_ber_alloc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_lber_ber_alloc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_lber_ber_alloc=no
 +	ac_cv_lib_lber_ber_alloc=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_alloc" >&5
+-echo "${ECHO_T}$ac_cv_lib_lber_ber_alloc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_alloc" >&5
 +echo "${ECHO_T}$ac_cv_lib_lber_ber_alloc" >&6; }
-+if test $ac_cv_lib_lber_ber_alloc = yes; then
-+  LIB_LBER=-llber
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+
-+
+ if test $ac_cv_lib_lber_ber_alloc = yes; then
+   LIB_LBER=-llber
+ fi
+@@ -51387,8 +50951,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether LDAP support can be compiled" >&5
+-echo $ECHO_N "checking whether LDAP support can be compiled... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether LDAP support can be compiled" >&5
 +echo $ECHO_N "checking whether LDAP support can be compiled... $ECHO_C" >&6; }
-+
-+  if test "x$with_ldap" != "xFOUND" ; then
-+    LDAP_ROOT="$with_ldap"
-+    if test "x$LDAP_ROOT" != "x/usr" ; then
-+      LDAP_INCS="-I${LDAP_ROOT}/include"
-+      LDAP_LIBS="-L${LDAP_ROOT}/lib "
-+      if test "$USE_RPATH" = "yes" ; then
-+        LDAP_RPATH="-R ${LDAP_ROOT}/lib"
-+      fi
-+    fi
-+    LDAP_LIBS="${LDAP_LIBS}-lldap"
-+  fi
-+  LDAP_LIBS="${LDAP_LIBS} ${LIB_LBER} ${LIBRESOLV}"
-+
-+  kde_safe_LIBS="$LIBS"
-+  kde_safe_CFLAGS="$CFLAGS"
-+  LIBS="$LIBS $all_libraries $LDAP_LIBS $KRB4_LIBS $X_EXTRA_LIBS"
-+  CFLAGS="$CFLAGS $all_includes $LDAP_INCS $KRB4_INCS"
-+
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+  #include <ldap.h>
-+  #if LDAP_API_VERSION < 2004
-+  #error LDAP version too old, please upgrade to a library supporting API 2004 or higher
-+  #endif
-+
-+int
-+main ()
-+{
-+
-+  LDAP *ldap;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 
+   if test "x$with_ldap" != "xFOUND" ; then
+     LDAP_ROOT="$with_ldap"
+@@ -51408,7 +50972,6 @@
+   LIBS="$LIBS $all_libraries $LDAP_LIBS $KRB4_LIBS $X_EXTRA_LIBS"
+   CFLAGS="$CFLAGS $all_includes $LDAP_INCS $KRB4_INCS"
+ 
+-
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -51438,36 +51001,33 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -67230,92 +52001,97 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+  :
-+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
+ 
+-with_ldap=no
 +	with_ldap=no
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+  CFLAGS=$kde_safe_CFLAGS
-+  LIBS=$kde_safe_LIBS
-+  if test "$with_ldap" = "no" ; then
-+    LDAP_INCS=
-+    LDAP_LIBS=
-+    LDAP_RPATH=
-+    LDAP_SUBDIR=
+       conftest$ac_exeext conftest.$ac_ext
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -51482,8 +51042,8 @@
+     LDAP_LIBS=
+     LDAP_RPATH=
+     LDAP_SUBDIR=
+-    echo "$as_me:$LINENO: result: no (but first try gave $msg)" >&5
+-echo "${ECHO_T}no (but first try gave $msg)" >&6
 +    { echo "$as_me:$LINENO: result: no (but first try gave $msg)" >&5
 +echo "${ECHO_T}no (but first try gave $msg)" >&6; }
-+  else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBLDAP 1
-+_ACEOF
-+
-+    LDAP_SUBDIR="ldap"
+   else
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -51491,8 +51051,8 @@
+ _ACEOF
+ 
+     LDAP_SUBDIR="ldap"
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +    { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+  fi
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$LDAP_SUBDIR"; then
-+  include_kioslave_ldap_TRUE=
-+  include_kioslave_ldap_FALSE='#'
-+else
-+  include_kioslave_ldap_TRUE='#'
-+  include_kioslave_ldap_FALSE=
-+fi
-+
-+
-+########### Check for linux/cdrom.h
-+
-+if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
+   fi
+ 
+ 
+@@ -51513,17 +51073,17 @@
+ ########### Check for linux/cdrom.h
+ 
+ if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
+-echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
 +echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5
+-echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5
 +echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking linux/cdrom.h usability" >&5
+-echo $ECHO_N "checking linux/cdrom.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking linux/cdrom.h usability" >&5
 +echo $ECHO_N "checking linux/cdrom.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <linux/cdrom.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -51534,41 +51094,37 @@
+ #include <linux/cdrom.h>
+ _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;;
@@ -67323,38 +52099,59 @@
 +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
+   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
 +  (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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking linux/cdrom.h presence" >&5
+-echo $ECHO_N "checking linux/cdrom.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking linux/cdrom.h presence" >&5
 +echo $ECHO_N "checking linux/cdrom.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <linux/cdrom.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -51577,24 +51133,22 @@
+ /* end confdefs.h.  */
+ #include <linux/cdrom.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -67362,675 +52159,510 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -51602,9 +51156,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -51628,25 +51183,18 @@
+ echo "$as_me: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: linux/cdrom.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: linux/cdrom.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: linux/cdrom.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: linux/cdrom.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: linux/cdrom.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: linux/cdrom.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: linux/cdrom.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: linux/cdrom.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
+-echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
 +echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_linux_cdrom_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_linux_cdrom_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5
+-echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5
 +echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_linux_cdrom_h = yes; then
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define COMPILE_LINUXCDPOLLING 1
-+_ACEOF
-+
-+  LINUXCDPOLLING=yes
-+
-+
-+fi
-+
-+
-+
-+
-+
+ 
+ fi
+ if test $ac_cv_header_linux_cdrom_h = yes; then
+@@ -51665,19 +51213,19 @@
+ 
+ 
+ 
+-# Check whether --with-hal or --without-hal was given.
 +# Check whether --with-hal was given.
-+if test "${with_hal+set}" = set; then
+ if test "${with_hal+set}" = set; then
+-  withval="$with_hal"
+-  hal_test="$withval"
 +  withval=$with_hal; hal_test="$withval"
-+else
-+  hal_test="yes"
+ else
+   hal_test="yes"
+-fi;
 +fi
 +
-+
-+if test "x$hal_test" = "xyes" ; then
-+
-+########### Check for the HAL
+ 
+ if test "x$hal_test" = "xyes" ; then
+ 
+ ########### Check for the HAL
+-  echo "$as_me:$LINENO: checking for the HAL" >&5
+-echo $ECHO_N "checking for the HAL... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for the HAL" >&5
 +echo $ECHO_N "checking for the HAL... $ECHO_C" >&6; }
-+
-+  hal_inc=NOTFOUND
-+  hal_lib=NOTFOUND
-+  hal=NOTFOUND
-+
-+  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/hal /usr/local/include /usr/local/include/hal"
-+
-+hal_incdir=NO
-+for i in $search_incs;
-+do
-+  for j in libhal.h libhal-storage.h;
-+  do
+ 
+   hal_inc=NOTFOUND
+   hal_lib=NOTFOUND
+@@ -51690,7 +51238,7 @@
+ do
+   for j in libhal.h libhal-storage.h;
+   do
+-    echo "configure: 51693: $i/$j" >&5
 +    echo "configure: 51241: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      hal_incdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+
-+  if test -r $hal_incdir/libhal.h && test -r $hal_incdir/libhal-storage.h && grep LibHalVolume $hal_incdir/libhal-storage.h > /dev/null 2>&1; then
-+    HAL_INCS="-I$hal_incdir"
-+    hal_inc=FOUND
-+  fi
-+
-+  search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff"
-+
-+hal_libdir=NO
-+for i in $search_libs;
-+do
-+  for j in libhal.so libhal-storage.so;
-+  do
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       hal_incdir=$i
+@@ -51712,7 +51260,7 @@
+ do
+   for j in libhal.so libhal-storage.so;
+   do
+-    echo "configure: 51715: $i/$j" >&5
 +    echo "configure: 51263: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      hal_libdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+
-+  if test -r $hal_libdir/libhal.so && test -r $hal_libdir/libhal-storage.so ; then
-+    HAL_LIBS="-L$hal_libdir -lhal -lhal-storage"
-+    hal_lib=FOUND
-+  fi
-+
-+  if test "$hal_inc" != FOUND || test "$hal_lib" != FOUND; then
-+
-+
-+   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
-+   if test "$prefix" != "$kde_libs_prefix"; then
-+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
-+   fi
-+   export PKG_CONFIG_PATH
-+
-+  succeeded=no
-+
-+  if test -z "$PKG_CONFIG"; then
-+    # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       hal_libdir=$i
+@@ -51741,8 +51289,8 @@
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -51757,28 +51305,29 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
+ 
+   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+   ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
 +  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 +echo "${ECHO_T}$PKG_CONFIG" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+  fi
-+
-+  if test "$PKG_CONFIG" = "no" ; then
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+  else
-+     PKG_CONFIG_MIN_VERSION=0.9.0
-+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+   fi
+ 
+   if test "$PKG_CONFIG" = "no" ; then
+@@ -51789,25 +51338,25 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for hal > 0.5" >&5
+-echo $ECHO_N "checking for hal > 0.5... $ECHO_C" >&6
 +        { echo "$as_me:$LINENO: checking for hal > 0.5" >&5
 +echo $ECHO_N "checking for hal > 0.5... $ECHO_C" >&6; }
-+
-+        if $PKG_CONFIG --exists "hal > 0.5" ; then
+ 
+         if $PKG_CONFIG --exists "hal > 0.5" ; then
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +            { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+            succeeded=yes
-+
+             succeeded=yes
+ 
+-            echo "$as_me:$LINENO: checking HAL_CFLAGS" >&5
+-echo $ECHO_N "checking HAL_CFLAGS... $ECHO_C" >&6
 +            { echo "$as_me:$LINENO: checking HAL_CFLAGS" >&5
 +echo $ECHO_N "checking HAL_CFLAGS... $ECHO_C" >&6; }
-+            HAL_CFLAGS=`$PKG_CONFIG --cflags "hal > 0.5"`
+             HAL_CFLAGS=`$PKG_CONFIG --cflags "hal > 0.5"`
+-            echo "$as_me:$LINENO: result: $HAL_CFLAGS" >&5
+-echo "${ECHO_T}$HAL_CFLAGS" >&6
 +            { echo "$as_me:$LINENO: result: $HAL_CFLAGS" >&5
 +echo "${ECHO_T}$HAL_CFLAGS" >&6; }
-+
+ 
+-            echo "$as_me:$LINENO: checking HAL_LIBS" >&5
+-echo $ECHO_N "checking HAL_LIBS... $ECHO_C" >&6
 +            { echo "$as_me:$LINENO: checking HAL_LIBS" >&5
 +echo $ECHO_N "checking HAL_LIBS... $ECHO_C" >&6; }
-+            HAL_LIBS=`$PKG_CONFIG --libs "hal > 0.5"`
+             HAL_LIBS=`$PKG_CONFIG --libs "hal > 0.5"`
+-            echo "$as_me:$LINENO: result: $HAL_LIBS" >&5
+-echo "${ECHO_T}$HAL_LIBS" >&6
 +            { echo "$as_me:$LINENO: result: $HAL_LIBS" >&5
 +echo "${ECHO_T}$HAL_LIBS" >&6; }
-+        else
-+            HAL_CFLAGS=""
-+            HAL_LIBS=""
-+            ## If we have a custom action on failure, don't print errors, but
-+            ## do set a variable so people can do so.
-+            HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal > 0.5"`
-+
-+        fi
-+
-+
-+
-+     else
-+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+     fi
-+  fi
-+
-+  if test $succeeded = yes; then
-+      HAL_INCS=$HAL_CFLAGS; hal_inc=FOUND; hal_lib=FOUND;
-+  else
+         else
+             HAL_CFLAGS=""
+             HAL_LIBS=""
+@@ -51828,20 +51377,20 @@
+   if test $succeeded = yes; then
+       HAL_INCS=$HAL_CFLAGS; hal_inc=FOUND; hal_lib=FOUND;
+   else
+-     echo "$as_me:$LINENO: result: Nothing found on PKG_CONFIG_PATH" >&5
+-echo "${ECHO_T}Nothing found on PKG_CONFIG_PATH" >&6
 +     { echo "$as_me:$LINENO: result: Nothing found on PKG_CONFIG_PATH" >&5
 +echo "${ECHO_T}Nothing found on PKG_CONFIG_PATH" >&6; }
-+  fi
-+
-+
-+  fi
-+
-+  if test "$hal_inc" = FOUND && test "$hal_lib" = FOUND ; then
+   fi
+ 
+ 
+   fi
+ 
+   if test "$hal_inc" = FOUND && test "$hal_lib" = FOUND ; then
+-      echo "$as_me:$LINENO: result: headers $HAL_INCS  libraries $HAL_LIBS" >&5
+-echo "${ECHO_T}headers $HAL_INCS  libraries $HAL_LIBS" >&6
 +      { echo "$as_me:$LINENO: result: headers $HAL_INCS  libraries $HAL_LIBS" >&5
 +echo "${ECHO_T}headers $HAL_INCS  libraries $HAL_LIBS" >&6; }
-+      hal=FOUND
-+  else
+       hal=FOUND
+   else
+-      echo "$as_me:$LINENO: result: searched but not found" >&5
+-echo "${ECHO_T}searched but not found" >&6
 +      { echo "$as_me:$LINENO: result: searched but not found" >&5
 +echo "${ECHO_T}searched but not found" >&6; }
-+  fi
-+
-+
-+
-+
-+
-+
-+########### Check for DBus
-+
+   fi
+ 
+ 
+@@ -51851,8 +51400,8 @@
+ 
+ ########### Check for DBus
+ 
+-  echo "$as_me:$LINENO: checking for DBus" >&5
+-echo $ECHO_N "checking for DBus... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for DBus" >&5
 +echo $ECHO_N "checking for DBus... $ECHO_C" >&6; }
-+
-+  dbus_inc=NOTFOUND
-+  dbus_lib=NOTFOUND
-+  dbus=NOTFOUND
-+
-+  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-+
-+dbus_incdir=NO
-+for i in $search_incs;
-+do
-+  for j in dbus/dbus.h;
-+  do
+ 
+   dbus_inc=NOTFOUND
+   dbus_lib=NOTFOUND
+@@ -51865,7 +51414,7 @@
+ do
+   for j in dbus/dbus.h;
+   do
+-    echo "configure: 51868: $i/$j" >&5
 +    echo "configure: 51417: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      dbus_incdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+
-+  search_incs_arch_deps="$kde_includes $kde_extra_includes /usr/lib$kdelibsuff/dbus-1.0/include /usr/local/lib$kdelibsuff/dbus-1.0/include"
-+
-+dbus_incdir_arch_deps=NO
-+for i in $search_incs_arch_deps;
-+do
-+  for j in dbus/dbus-arch-deps.h;
-+  do
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       dbus_incdir=$i
+@@ -51882,7 +51431,7 @@
+ do
+   for j in dbus/dbus-arch-deps.h;
+   do
+-    echo "configure: 51885: $i/$j" >&5
 +    echo "configure: 51434: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      dbus_incdir_arch_deps=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+
-+  if test -r $dbus_incdir/dbus/dbus.h && test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h ; then
-+    DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps"
-+    dbus_inc=FOUND
-+  fi
-+
-+  search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff"
-+
-+dbus_libdir=NO
-+for i in $search_libs;
-+do
-+  for j in libdbus-1.so;
-+  do
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       dbus_incdir_arch_deps=$i
+@@ -51904,7 +51453,7 @@
+ do
+   for j in libdbus-1.so;
+   do
+-    echo "configure: 51907: $i/$j" >&5
 +    echo "configure: 51456: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      dbus_libdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+
-+  if test -r $dbus_libdir/libdbus-1.so ; then
-+    DBUS_LIBS="-L$dbus_libdir -ldbus-1"
-+    dbus_lib=FOUND
-+  fi
-+
-+  if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then
-+
-+
-+   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
-+   if test "$prefix" != "$kde_libs_prefix"; then
-+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
-+   fi
-+   export PKG_CONFIG_PATH
-+
-+  succeeded=no
-+
-+  if test -z "$PKG_CONFIG"; then
-+    # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       dbus_libdir=$i
+@@ -51933,8 +51482,8 @@
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -51949,28 +51498,29 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
+ 
+   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+   ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
 +  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 +echo "${ECHO_T}$PKG_CONFIG" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+  fi
-+
-+  if test "$PKG_CONFIG" = "no" ; then
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+  else
-+     PKG_CONFIG_MIN_VERSION=0.9.0
-+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+   fi
+ 
+   if test "$PKG_CONFIG" = "no" ; then
+@@ -51981,25 +51531,25 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for \"dbus-1\"" >&5
+-echo $ECHO_N "checking for \"dbus-1\"... $ECHO_C" >&6
 +        { echo "$as_me:$LINENO: checking for \"dbus-1\"" >&5
 +echo $ECHO_N "checking for \"dbus-1\"... $ECHO_C" >&6; }
-+
-+        if $PKG_CONFIG --exists ""dbus-1"" ; then
+ 
+         if $PKG_CONFIG --exists ""dbus-1"" ; then
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +            { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+            succeeded=yes
-+
+             succeeded=yes
+ 
+-            echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5
+-echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6
 +            { echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5
 +echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6; }
-+            DBUS_CFLAGS=`$PKG_CONFIG --cflags ""dbus-1""`
+             DBUS_CFLAGS=`$PKG_CONFIG --cflags ""dbus-1""`
+-            echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
+-echo "${ECHO_T}$DBUS_CFLAGS" >&6
 +            { echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
 +echo "${ECHO_T}$DBUS_CFLAGS" >&6; }
-+
+ 
+-            echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
+-echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6
 +            { echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
 +echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6; }
-+            DBUS_LIBS=`$PKG_CONFIG --libs ""dbus-1""`
+             DBUS_LIBS=`$PKG_CONFIG --libs ""dbus-1""`
+-            echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
+-echo "${ECHO_T}$DBUS_LIBS" >&6
 +            { echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
 +echo "${ECHO_T}$DBUS_LIBS" >&6; }
-+        else
-+            DBUS_CFLAGS=""
-+            DBUS_LIBS=""
-+            ## If we have a custom action on failure, don't print errors, but
-+            ## do set a variable so people can do so.
-+            DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""dbus-1""`
-+
-+        fi
-+
-+
-+
-+     else
-+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+     fi
-+  fi
-+
-+  if test $succeeded = yes; then
-+      DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND;
-+  else
+         else
+             DBUS_CFLAGS=""
+             DBUS_LIBS=""
+@@ -52020,8 +51570,8 @@
+   if test $succeeded = yes; then
+       DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND;
+   else
+-     echo "$as_me:$LINENO: result: Nothing found on PKG_CONFIG_PATH " >&5
+-echo "${ECHO_T}Nothing found on PKG_CONFIG_PATH " >&6
 +     { echo "$as_me:$LINENO: result: Nothing found on PKG_CONFIG_PATH " >&5
 +echo "${ECHO_T}Nothing found on PKG_CONFIG_PATH " >&6; }
-+  fi
-+
-+
-+  fi
-+
-+  dbus_bus_var=`pkg-config --variable=system_bus_default_address dbus-1 2>/dev/null`
-+  if test -z "$dbus_bus_var"; then
-+        dbus_bus_var="unix:path=/var/run/dbus/system_bus_socket"
-+  fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define DBUS_SYSTEM_BUS "$dbus_bus_var"
-+_ACEOF
-+
-+
-+  if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
+   fi
+ 
+ 
+@@ -52038,12 +51588,12 @@
+ 
+ 
+   if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
+-    echo "$as_me:$LINENO: result: headers $DBUS_INCS libraries $DBUS_LIBS" >&5
+-echo "${ECHO_T}headers $DBUS_INCS libraries $DBUS_LIBS" >&6
 +    { echo "$as_me:$LINENO: result: headers $DBUS_INCS libraries $DBUS_LIBS" >&5
 +echo "${ECHO_T}headers $DBUS_INCS libraries $DBUS_LIBS" >&6; }
-+    dbus=FOUND
-+  else
+     dbus=FOUND
+   else
+-    echo "$as_me:$LINENO: result: searched but not found" >&5
+-echo "${ECHO_T}searched but not found" >&6
 +    { echo "$as_me:$LINENO: result: searched but not found" >&5
 +echo "${ECHO_T}searched but not found" >&6; }
-+  fi
-+
-+
-+
-+
-+########### Check for DBus-Qt3 bindings
-+
+   fi
+ 
+ 
+@@ -52051,8 +51601,8 @@
+ 
+ ########### Check for DBus-Qt3 bindings
+ 
+-  echo "$as_me:$LINENO: checking for DBus-Qt3 bindings" >&5
+-echo $ECHO_N "checking for DBus-Qt3 bindings... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for DBus-Qt3 bindings" >&5
 +echo $ECHO_N "checking for DBus-Qt3 bindings... $ECHO_C" >&6; }
-+
-+  dbusqt_inc=NOTFOUND
-+  dbusqt_lib=NOTFOUND
-+  dbusqt=NOTFOUND
-+
-+  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-+
-+dbusqt_incdir=NO
-+for i in $search_incs;
-+do
-+  for j in dbus/connection.h;
-+  do
+ 
+   dbusqt_inc=NOTFOUND
+   dbusqt_lib=NOTFOUND
+@@ -52065,7 +51615,7 @@
+ do
+   for j in dbus/connection.h;
+   do
+-    echo "configure: 52068: $i/$j" >&5
 +    echo "configure: 51618: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      dbusqt_incdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+
-+  if test -r $dbusqt_incdir/dbus/connection.h ; then
-+    have_qt_patch=0
-+    grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \
-+    > /dev/null 2>&1 && have_qt_patch=1
-+    if test $have_qt_patch = 1 ; then
-+      DBUSQT_INCS="-I$dbusqt_incdir"
-+      dbusqt_inc=FOUND
-+    fi
-+  fi
-+
-+  search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff"
-+
-+dbusqt_libdir=NO
-+for i in $search_libs;
-+do
-+  for j in libdbus-qt-1.so;
-+  do
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       dbusqt_incdir=$i
+@@ -52092,7 +51642,7 @@
+ do
+   for j in libdbus-qt-1.so;
+   do
+-    echo "configure: 52095: $i/$j" >&5
 +    echo "configure: 51645: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      dbusqt_libdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+
-+  if test -r $dbusqt_libdir/libdbus-qt-1.so ; then
-+    DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
-+    dbusqt_lib=FOUND
-+  fi
-+
-+  if test $dbusqt_inc != FOUND  || test $dbusqt_lib != FOUND ; then
-+
-+    search_incs="`pkg-config --cflags dbus-1  |sed 's/-I//g'`"
-+
-+dbusqt_incdir=NO
-+for i in $search_incs;
-+do
-+  for j in dbus/connection.h;
-+  do
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       dbusqt_libdir=$i
+@@ -52116,7 +51666,7 @@
+ do
+   for j in dbus/connection.h;
+   do
+-    echo "configure: 52119: $i/$j" >&5
 +    echo "configure: 51669: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      dbusqt_incdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+    if test -r $dbusqt_incdir/dbus/connection.h ; then
-+      have_qt_patch=0
-+      grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \
-+      > /dev/null 2>&1 && have_qt_patch=1
-+      if test $have_qt_patch = 1 ; then
-+        DBUSQT_INCS="-I$dbusqt_incdir"
-+        dbusqt_inc=FOUND
-+      fi
-+    fi
-+
-+    search_libs="`pkg-config --libs dbus-1 --libs-only-L | sed 's/-L//g'`"
-+
-+dbusqt_libdir=NO
-+for i in $search_libs;
-+do
-+  for j in libdbus-qt-1.so;
-+  do
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       dbusqt_incdir=$i
+@@ -52142,7 +51692,7 @@
+ do
+   for j in libdbus-qt-1.so;
+   do
+-    echo "configure: 52145: $i/$j" >&5
 +    echo "configure: 51695: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      dbusqt_libdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+
-+    if test -r $dbusqt_libdir/libdbus-qt-1.so ; then
-+      DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
-+      dbusqt_lib=FOUND
-+    fi
-+
-+  fi
-+
-+
-+  if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       dbusqt_libdir=$i
+@@ -52161,12 +51711,12 @@
+ 
+ 
+   if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then
+-    echo "$as_me:$LINENO: result: headers $dbusqt_incdir libraries $dbusqt_libdir" >&5
+-echo "${ECHO_T}headers $dbusqt_incdir libraries $dbusqt_libdir" >&6
 +    { echo "$as_me:$LINENO: result: headers $dbusqt_incdir libraries $dbusqt_libdir" >&5
 +echo "${ECHO_T}headers $dbusqt_incdir libraries $dbusqt_libdir" >&6; }
-+    dbusqt=FOUND
-+  else
+     dbusqt=FOUND
+   else
+-    echo "$as_me:$LINENO: result: searched but not found" >&5
+-echo "${ECHO_T}searched but not found" >&6
 +    { echo "$as_me:$LINENO: result: searched but not found" >&5
 +echo "${ECHO_T}searched but not found" >&6; }
-+  fi
-+
-+
-+
-+fi
-+
-+########### Check if media HAL backend sould be compiled
-+
+   fi
+ 
+ 
+@@ -52175,8 +51725,8 @@
+ 
+ ########### Check if media HAL backend sould be compiled
+ 
+-echo "$as_me:$LINENO: checking if the HAL backend for media:/ should be compiled" >&5
+-echo $ECHO_N "checking if the HAL backend for media:/ should be compiled... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if the HAL backend for media:/ should be compiled" >&5
 +echo $ECHO_N "checking if the HAL backend for media:/ should be compiled... $ECHO_C" >&6; }
-+
-+HALBACKEND=no
-+if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test "x$dbusqt" = "xFOUND" ; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define COMPILE_HALBACKEND 1
-+_ACEOF
-+
-+  HALBACKEND=yes
-+
+ 
+ HALBACKEND=no
+ if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test "x$dbusqt" = "xFOUND" ; then
+@@ -52187,11 +51737,11 @@
+ 
+   HALBACKEND=yes
+ 
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+
-+if test "$LINUXCDPOLLING" = "yes"; then
-+  include_media_linuxcdpolling_TRUE=
-+  include_media_linuxcdpolling_FALSE='#'
-+else
-+  include_media_linuxcdpolling_TRUE='#'
-+  include_media_linuxcdpolling_FALSE=
-+fi
-+
-+
-+
-+if test "$HALBACKEND" = yes; then
-+  include_media_halbackend_TRUE=
-+  include_media_halbackend_FALSE='#'
-+else
-+  include_media_halbackend_TRUE='#'
-+  include_media_halbackend_FALSE=
-+fi
-+
-+
-+
-+
-+
+ fi
+ 
+ 
+@@ -52218,15 +51768,15 @@
+ 
+ 
+ 
+-# Check whether --enable-largefile or --disable-largefile was given.
 +# Check whether --enable-largefile was given.
-+if test "${enable_largefile+set}" = set; then
+ if test "${enable_largefile+set}" = set; then
+-  enableval="$enable_largefile"
 +  enableval=$enable_largefile;
 +fi
-+
-+if test "$enable_largefile" != no; then
-+
+ 
+-fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+-echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
 +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
-+if test "${ac_cv_sys_largefile_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_sys_largefile_CC=no
-+     if test "$GCC" != yes; then
-+       ac_save_CC=$CC
-+       while :; do
+ if test "${ac_cv_sys_largefile_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -52234,8 +51784,8 @@
+      if test "$GCC" != yes; then
+        ac_save_CC=$CC
+        while :; do
+-     	 # IRIX 6.2 and later do not support large files by default,
+-     	 # so use the C compiler's -n32 option if that helps.
 +	 # IRIX 6.2 and later do not support large files by default,
 +	 # so use the C compiler's -n32 option if that helps.
-+	 cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ 	 cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -52259,84 +51809,77 @@
+   return 0;
+ }
+ _ACEOF
+-     	 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
@@ -68039,23 +52671,42 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext
+-     	 CC="$CC -n32"
+-     	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext
 +	 CC="$CC -n32"
 +	 rm -f conftest.$ac_objext
@@ -68066,66 +52717,71 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_sys_largefile_CC=' -n32'; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext
-+	 break
-+       done
-+       CC=$ac_save_CC
-+       rm -f conftest.$ac_ext
-+    fi
-+fi
+ 	 break
+        done
+        CC=$ac_save_CC
+        rm -f conftest.$ac_ext
+     fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+-echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
 +echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
-+  if test "$ac_cv_sys_largefile_CC" != no; then
-+    CC=$CC$ac_cv_sys_largefile_CC
-+  fi
-+
+   if test "$ac_cv_sys_largefile_CC" != no; then
+     CC=$CC$ac_cv_sys_largefile_CC
+   fi
+ 
+-  echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+-echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
-+if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  while :; do
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   while :; do
+-  ac_cv_sys_file_offset_bits=no
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -52361,34 +51904,31 @@
+ }
+ _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;;
@@ -68133,49 +52789,49 @@
 +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
+   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
+-  break
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
 +  ac_cv_sys_file_offset_bits=no; break
-+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
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#define _FILE_OFFSET_BITS 64
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -52414,54 +51954,53 @@
+ }
+ _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;;
@@ -68183,70 +52839,79 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_sys_file_offset_bits=64; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_cv_sys_file_offset_bits=64; break
+ 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
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_sys_file_offset_bits=unknown
-+  break
-+done
-+fi
+   break
+ done
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
+-if test "$ac_cv_sys_file_offset_bits" != no; then
+-
 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
 +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
 +case $ac_cv_sys_file_offset_bits in #(
 +  no | unknown) ;;
 +  *)
-+cat >>confdefs.h <<_ACEOF
-+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-+_ACEOF
+ cat >>confdefs.h <<_ACEOF
+ #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+ _ACEOF
+-
+-fi
 +;;
 +esac
-+rm -f conftest*
+ rm -f conftest*
+-  echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+-echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 +  if test $ac_cv_sys_file_offset_bits = unknown; then
 +    { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
 +echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
-+if test "${ac_cv_sys_large_files+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  while :; do
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_sys_large_files+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   while :; do
+-  ac_cv_sys_large_files=no
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -52486,34 +52025,31 @@
+ }
+ _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;;
@@ -68254,49 +52919,49 @@
 +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
+   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
+-  break
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
 +  ac_cv_sys_large_files=no; break
-+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
+ 
 +
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#define _LARGE_FILES 1
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -52539,47 +52075,47 @@
+ }
+ _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;;
@@ -68304,101 +52969,122 @@
 +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
+   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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_sys_large_files=1; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_cv_sys_large_files=1; break
+ 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
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_sys_large_files=unknown
-+  break
-+done
-+fi
+   break
+ done
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+-echo "${ECHO_T}$ac_cv_sys_large_files" >&6
+-if test "$ac_cv_sys_large_files" != no; then
+-
 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
 +echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
 +case $ac_cv_sys_large_files in #(
 +  no | unknown) ;;
 +  *)
-+cat >>confdefs.h <<_ACEOF
-+#define _LARGE_FILES $ac_cv_sys_large_files
-+_ACEOF
+ cat >>confdefs.h <<_ACEOF
+ #define _LARGE_FILES $ac_cv_sys_large_files
+ _ACEOF
+-
+-fi
 +;;
 +esac
-+rm -f conftest*
+ rm -f conftest*
 +  fi
-+fi
-+
-+if test "$ac_cv_sys_file_offset_bits" != no; then
-+  CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-+fi
-+
-+if test "x$ac_cv_sys_large_files" != "xno"; then
-+  CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1"
-+fi
-+
-+
-+
-+
-+
-+
+ fi
+ 
+ if test "$ac_cv_sys_file_offset_bits" != no; then
+@@ -52595,13 +52131,13 @@
+ 
+ 
+ 
+-# Check whether --with-samba or --without-samba was given.
 +# Check whether --with-samba was given.
-+if test "${with_samba+set}" = set; then
+ if test "${with_samba+set}" = set; then
+-  withval="$with_samba"
+-
 +  withval=$with_samba;
-+else
-+  with_samba=check
+ else
+   with_samba=check
+-fi;
 +fi
 +
-+
-+have_libsmbclient=no
-+if test "x$with_samba" != xno; then
-+  have_libsmbclient=yes
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ 
+ have_libsmbclient=no
+ if test "x$with_samba" != xno; then
+@@ -52610,8 +52146,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+   if test "${ac_cv_header_libsmbclient_h+set}" = set; then
+ 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'
+@@ -52621,17 +52156,17 @@
+ 
+ 
+    if test "${ac_cv_header_libsmbclient_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for libsmbclient.h" >&5
+-echo $ECHO_N "checking for libsmbclient.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for libsmbclient.h" >&5
 +echo $ECHO_N "checking for libsmbclient.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libsmbclient_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_libsmbclient_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libsmbclient_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5
 +echo "${ECHO_T}$ac_cv_header_libsmbclient_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking libsmbclient.h usability" >&5
+-echo $ECHO_N "checking libsmbclient.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking libsmbclient.h usability" >&5
 +echo $ECHO_N "checking libsmbclient.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <libsmbclient.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -52642,41 +52177,37 @@
+ #include <libsmbclient.h>
+ _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;;
@@ -68406,38 +53092,59 @@
 +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
+   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_cxx_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_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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking libsmbclient.h presence" >&5
+-echo $ECHO_N "checking libsmbclient.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking libsmbclient.h presence" >&5
 +echo $ECHO_N "checking libsmbclient.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <libsmbclient.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -52685,24 +52216,22 @@
+ /* end confdefs.h.  */
+ #include <libsmbclient.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -68445,118 +53152,110 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -52710,9 +52239,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -52736,25 +52266,18 @@
+ echo "$as_me: WARNING: libsmbclient.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: libsmbclient.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libsmbclient.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libsmbclient.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libsmbclient.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: libsmbclient.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: libsmbclient.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libsmbclient.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libsmbclient.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libsmbclient.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: libsmbclient.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libsmbclient.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: libsmbclient.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libsmbclient.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libsmbclient.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for libsmbclient.h" >&5
+-echo $ECHO_N "checking for libsmbclient.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for libsmbclient.h" >&5
 +echo $ECHO_N "checking for libsmbclient.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libsmbclient_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_libsmbclient_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_libsmbclient_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_libsmbclient_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libsmbclient_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5
 +echo "${ECHO_T}$ac_cv_header_libsmbclient_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_libsmbclient_h = yes; then
-+  :
-+else
-+  have_libsmbclient=no
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
-+
+ 
+ fi
+ if test $ac_cv_header_libsmbclient_h = yes; then
+@@ -52782,8 +52305,8 @@
+ 	;;
+      esac
+ 
+-echo "$as_me:$LINENO: checking for smbc_new_context in -lsmbclient" >&5
+-echo $ECHO_N "checking for smbc_new_context in -lsmbclient... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for smbc_new_context in -lsmbclient" >&5
 +echo $ECHO_N "checking for smbc_new_context in -lsmbclient... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_smbclient_smbc_new_context+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsmbclient  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_smbclient_smbc_new_context+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -52796,56 +52319,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char smbc_new_context ();
-+int
-+main ()
-+{
+ #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 smbc_new_context ();
+ int
+ main ()
+ {
+-smbc_new_context ();
 +return smbc_new_context ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -68564,97 +53263,102 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_smbclient_smbc_new_context=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_smbclient_smbc_new_context=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_smbclient_smbc_new_context=no
 +	ac_cv_lib_smbclient_smbc_new_context=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_smbclient_smbc_new_context" >&5
+-echo "${ECHO_T}$ac_cv_lib_smbclient_smbc_new_context" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_smbclient_smbc_new_context" >&5
 +echo "${ECHO_T}$ac_cv_lib_smbclient_smbc_new_context" >&6; }
-+if test $ac_cv_lib_smbclient_smbc_new_context = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSMBCLIENT 1
-+_ACEOF
-+
-+  LIBS="-lsmbclient $LIBS"
-+
-+else
-+  have_libsmbclient=no
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+
-+  SMBCLIENT_EXTRA_LIBS=""
+ if test $ac_cv_lib_smbclient_smbc_new_context = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSMBCLIENT 1
+@@ -52862,8 +52382,8 @@
+ 
+ 
+   SMBCLIENT_EXTRA_LIBS=""
+-  echo "$as_me:$LINENO: checking for yp_get_default_domain" >&5
+-echo $ECHO_N "checking for yp_get_default_domain... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for yp_get_default_domain" >&5
 +echo $ECHO_N "checking for yp_get_default_domain... $ECHO_C" >&6; }
-+if test "${ac_cv_func_yp_get_default_domain+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define yp_get_default_domain to an innocuous variant, in case <limits.h> declares yp_get_default_domain.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define yp_get_default_domain innocuous_yp_get_default_domain
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char yp_get_default_domain (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef yp_get_default_domain
-+
+ if test "${ac_cv_func_yp_get_default_domain+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -52890,68 +52410,59 @@
+ 
+ #undef yp_get_default_domain
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char yp_get_default_domain ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 yp_get_default_domain ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_yp_get_default_domain) || defined (__stub___yp_get_default_domain)
 +#if defined __stub_yp_get_default_domain || defined __stub___yp_get_default_domain
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = yp_get_default_domain;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != yp_get_default_domain;
 +return yp_get_default_domain ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -68662,72 +53366,87 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_yp_get_default_domain=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_func_yp_get_default_domain=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_yp_get_default_domain=no
 +	ac_cv_func_yp_get_default_domain=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_yp_get_default_domain" >&5
+-echo "${ECHO_T}$ac_cv_func_yp_get_default_domain" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_yp_get_default_domain" >&5
 +echo "${ECHO_T}$ac_cv_func_yp_get_default_domain" >&6; }
-+if test $ac_cv_func_yp_get_default_domain = yes; then
-+  :
-+else
-+
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
+ if test $ac_cv_func_yp_get_default_domain = yes; then
+   :
+ else
+@@ -52965,8 +52476,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
+-echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
 +echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -52979,56 +52490,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char yp_get_default_domain ();
-+int
-+main ()
-+{
+ #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 yp_get_default_domain ();
+ int
+ main ()
+ {
+-yp_get_default_domain ();
 +return yp_get_default_domain ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -68735,183 +53454,159 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_yp_get_default_domain=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_nsl_yp_get_default_domain=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_nsl_yp_get_default_domain=no
 +	ac_cv_lib_nsl_yp_get_default_domain=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
 +echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6; }
-+if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
-+  SMBCLIENT_EXTRA_LIBS="-lnsl"
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+
-+fi
-+
-+
-+
-+
-+  if test "x$with_samba" != xcheck && test "x$have_libsmbclient" = xno; then
-+    { { echo "$as_me:$LINENO: error: --with-samba was given, but test for libsmbclient failed" >&5
-+echo "$as_me: error: --with-samba was given, but test for libsmbclient failed" >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+fi
-+
-+
-+
-+if test "x$have_libsmbclient" = xyes; then
-+  include_kioslave_smb_TRUE=
-+  include_kioslave_smb_FALSE='#'
-+else
-+  include_kioslave_smb_TRUE='#'
-+  include_kioslave_smb_FALSE=
-+fi
-+
-+
-+
-+
-+
+ if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
+   SMBCLIENT_EXTRA_LIBS="-lnsl"
+ fi
+@@ -53063,13 +52571,13 @@
+ 
+ 
+ 
+-# Check whether --with-openexr or --without-openexr was given.
 +# Check whether --with-openexr was given.
-+if test "${with_openexr+set}" = set; then
+ if test "${with_openexr+set}" = set; then
+-  withval="$with_openexr"
+-
 +  withval=$with_openexr;
-+else
-+  with_openexr=check
+ else
+   with_openexr=check
+-fi;
 +fi
 +
-+
-+if test "x$with_openexr" != xno; then
-+
-+
-+
-+if test "${ac_cv_libexr+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+  if test -z "$PKG_CONFIG"; then
-+    # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
+ 
+ if test "x$with_openexr" != xno; then
+ 
+@@ -53082,8 +52590,8 @@
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -53098,56 +52606,56 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
+ 
+   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+   ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
 +  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 +echo "${ECHO_T}$PKG_CONFIG" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+ 
 +
-+
-+  fi
-+
+   fi
+ 
+-  echo "$as_me:$LINENO: checking for OpenEXR libraries" >&5
+-echo $ECHO_N "checking for OpenEXR libraries... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for OpenEXR libraries" >&5
 +echo $ECHO_N "checking for OpenEXR libraries... $ECHO_C" >&6; }
-+
-+  if test "$PKG_CONFIG" = "no" ; then
+ 
+   if test "$PKG_CONFIG" = "no" ; then
+-     echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +     { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+  else
-+     if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +        { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+        EXRSTATUS=no
-+     else
-+        if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+         EXRSTATUS=no
+      else
+         if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+-           echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +           { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+           EXRSTATUS=old
-+        else
-+           kde_save_LIBS="$LIBS"
-+           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
-+
+            EXRSTATUS=old
+         else
+            kde_save_LIBS="$LIBS"
+            LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
+ 
+-
+-            ac_ext=cc
 +            ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+           kde_save_CXXFLAGS="$CXXFLAGS"
-+           EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
-+           CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
-+
-+           cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+               #include <ImfRgbaFile.h>
-+
-+int
-+main ()
-+{
-+
-+               using namespace Imf;
-+               RgbaInputFile file ("dummy");
-+               return 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -53182,36 +52690,33 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -68919,105 +53614,88 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (exit $ac_status); } && {
 +	 test -z "$ac_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
-+  eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_libexr=no"
 +	eval "ac_cv_libexr=no"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+           LIBS="$kde_save_LIBS"
-+           CXXFLAGS="$kde_save_CXXFLAGS"
-+           ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+           if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_EXR 1
-+_ACEOF
-+
-+               LIB_EXR="$ac_cv_libexr"
+       conftest$ac_exeext conftest.$ac_ext
+            LIBS="$kde_save_LIBS"
+            CXXFLAGS="$kde_save_CXXFLAGS"
+@@ -53230,11 +52735,11 @@
+ _ACEOF
+ 
+                LIB_EXR="$ac_cv_libexr"
+-               echo "$as_me:$LINENO: result: $ac_cv_libexr" >&5
+-echo "${ECHO_T}$ac_cv_libexr" >&6
 +               { echo "$as_me:$LINENO: result: $ac_cv_libexr" >&5
 +echo "${ECHO_T}$ac_cv_libexr" >&6; }
-+           else
+            else
+-               echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +               { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+               LIB_EXR=""
-+           fi
-+        fi
-+     fi
-+  fi
-+
-+
-+
-+
-+  if test "x$with_openexr" != xcheck && test -z "$LIB_EXR"; then
-+    { { echo "$as_me:$LINENO: error: --with-openexr was given, but test for OpenEXR failed" >&5
-+echo "$as_me: error: --with-openexr was given, but test for OpenEXR failed" >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+fi
-+
-+
-+
-+if test -n "$LIB_EXR"; then
-+  include_EXR_MODULES_TRUE=
-+  include_EXR_MODULES_FALSE='#'
-+else
-+  include_EXR_MODULES_TRUE='#'
-+  include_EXR_MODULES_FALSE=
-+fi
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+                LIB_EXR=""
+            fi
+         fi
+@@ -53266,8 +52771,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
+ 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'
+@@ -53276,8 +52780,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/Xfixes.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xfixes.h... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for X11/extensions/Xfixes.h" >&5
 +echo $ECHO_N "checking for X11/extensions/Xfixes.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+
-+#include <X11/extensions/Xfixes.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -53292,38 +52796,34 @@
+ #include <X11/extensions/Xfixes.h>
+ _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;;
@@ -69025,82 +53703,85 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_X11_extensions_Xfixes_h=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_header_X11_extensions_Xfixes_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_Xfixes_h=no
 +	ac_cv_header_X11_extensions_Xfixes_h=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_header_X11_extensions_Xfixes_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xfixes_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xfixes_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xfixes_h" >&6; }
-+if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then
-+  xfixes_h=yes
-+else
-+  xfixes_h=no
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+if test "$xfixes_h" = yes; then
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
+ if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then
+   xfixes_h=yes
+ else
+@@ -53349,8 +52849,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XFixesQueryExtension in -lXfixes" >&5
+-echo $ECHO_N "checking for XFixesQueryExtension in -lXfixes... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for XFixesQueryExtension in -lXfixes" >&5
 +echo $ECHO_N "checking for XFixesQueryExtension in -lXfixes... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXfixes -lXext -lX11 $X_EXTRA_LIBS $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -53363,56 +52863,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XFixesQueryExtension ();
-+int
-+main ()
-+{
+ #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 XFixesQueryExtension ();
+ int
+ main ()
+ {
+-XFixesQueryExtension ();
 +return XFixesQueryExtension ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -69108,97 +53789,76 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_Xfixes_XFixesQueryExtension=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xfixes_XFixesQueryExtension=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xfixes_XFixesQueryExtension=no
 +	ac_cv_lib_Xfixes_XFixesQueryExtension=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xfixes_XFixesQueryExtension" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xfixes_XFixesQueryExtension" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xfixes_XFixesQueryExtension" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xfixes_XFixesQueryExtension" >&6; }
-+if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then
-+  LIB_XFIXES=-lXfixes
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_XFIXES 1
-+_ACEOF
-+
-+
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+else
-+  LIB_XFIXES=
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+kde_mallinfo_type=
-+
+ if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then
+   LIB_XFIXES=-lXfixes
+ 
+@@ -53440,15 +52937,14 @@
+ 
+ kde_mallinfo_type=
+ 
+-echo "$as_me:$LINENO: checking for mallinfo() in <stdlib.h>" >&5
+-echo $ECHO_N "checking for mallinfo() in <stdlib.h>... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for mallinfo() in <stdlib.h>" >&5
 +echo $ECHO_N "checking for mallinfo() in <stdlib.h>... $ECHO_C" >&6; }
-+if test "${kde_cv_func_mallinfo_stdlib+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_mallinfo_stdlib+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+	struct mallinfo m;
-+	int dummy;
-+	m = mallinfo();
-+	dummy = m.hblkhd;
-+	dummy = m.uordblks;
-+	dummy = m.usmblks;
-+	dummy = dummy;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -53481,35 +52977,31 @@
+ }
+ _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;;
@@ -69206,81 +53866,75 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  kde_cv_func_mallinfo_stdlib=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   kde_cv_func_mallinfo_stdlib=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_mallinfo_stdlib=no
 +	kde_cv_func_mallinfo_stdlib=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_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if test "$kde_cv_func_mallinfo_stdlib" = "yes"; then
-+    kde_mallinfo_type=stdlib
-+fi
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -53522,20 +53014,19 @@
+ if test "$kde_cv_func_mallinfo_stdlib" = "yes"; then
+     kde_mallinfo_type=stdlib
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_stdlib" >&5
+-echo "${ECHO_T}$kde_cv_func_mallinfo_stdlib" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_stdlib" >&5
 +echo "${ECHO_T}$kde_cv_func_mallinfo_stdlib" >&6; }
-+
-+if test -z "$kde_mallinfo_type"; then
-+
+ 
+ if test -z "$kde_mallinfo_type"; then
+ 
+-echo "$as_me:$LINENO: checking for mallinfo() in <malloc.h>" >&5
+-echo $ECHO_N "checking for mallinfo() in <malloc.h>... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for mallinfo() in <malloc.h>" >&5
 +echo $ECHO_N "checking for mallinfo() in <malloc.h>... $ECHO_C" >&6; }
-+if test "${kde_cv_func_mallinfo_malloc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_mallinfo_malloc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <malloc.h>
-+int
-+main ()
-+{
-+
-+	struct mallinfo m;
-+	int dummy;
-+	m = mallinfo();
-+	dummy = m.hblkhd;
-+	dummy = m.uordblks;
-+	dummy = m.usmblks;
-+	dummy = dummy;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -53568,35 +53059,31 @@
+ }
+ _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;;
@@ -69288,64 +53942,80 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  kde_cv_func_mallinfo_malloc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   kde_cv_func_mallinfo_malloc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_mallinfo_malloc=no
 +	kde_cv_func_mallinfo_malloc=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_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+if test "$kde_cv_func_mallinfo_malloc" = "yes"; then
-+    kde_mallinfo_type=malloc
-+fi
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -53609,8 +53096,8 @@
+ if test "$kde_cv_func_mallinfo_malloc" = "yes"; then
+     kde_mallinfo_type=malloc
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_malloc" >&5
+-echo "${ECHO_T}$kde_cv_func_mallinfo_malloc" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_malloc" >&5
 +echo "${ECHO_T}$kde_cv_func_mallinfo_malloc" >&6; }
-+
-+fi
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ 
+ fi
+ 
+@@ -53621,50 +53108,46 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char mallinfo ();
-+int
-+main ()
-+{
+ #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 mallinfo ();
+ int
+ main ()
+ {
+-mallinfo ();
 +return mallinfo ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -69353,51 +54023,68 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+  :
-+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
+ 
+- echo "$as_me:$LINENO: checking for mallinfo in -lmalloc" >&5
+-echo $ECHO_N "checking for mallinfo in -lmalloc... $ECHO_C" >&6
 +	 { echo "$as_me:$LINENO: checking for mallinfo in -lmalloc" >&5
 +echo $ECHO_N "checking for mallinfo in -lmalloc... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_malloc_mallinfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmalloc  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_malloc_mallinfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -53677,56 +53160,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char mallinfo ();
-+int
-+main ()
-+{
+ #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 mallinfo ();
+ int
+ main ()
+ {
+-mallinfo ();
 +return mallinfo ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -69405,136 +54092,83 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_malloc_mallinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_malloc_mallinfo=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_malloc_mallinfo=no
 +	ac_cv_lib_malloc_mallinfo=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_malloc_mallinfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_malloc_mallinfo" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_malloc_mallinfo" >&5
 +echo "${ECHO_T}$ac_cv_lib_malloc_mallinfo" >&6; }
-+if test $ac_cv_lib_malloc_mallinfo = yes; then
-+   LIBMALLOC="-lmalloc"
+ if test $ac_cv_lib_malloc_mallinfo = yes; then
+    LIBMALLOC="-lmalloc"
+ 
+@@ -53736,20 +53216,20 @@
+ 
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+else
-+   kde_mallinfo_type=""
-+fi
-+
-+
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+
-+if test -n "$kde_mallinfo_type"; then
-+
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ if test -n "$kde_mallinfo_type"; then
+ 
+-echo "$as_me:$LINENO: checking whether to use mallinfo field hblkhd" >&5
+-echo $ECHO_N "checking whether to use mallinfo field hblkhd... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether to use mallinfo field hblkhd" >&5
 +echo $ECHO_N "checking whether to use mallinfo field hblkhd... $ECHO_C" >&6; }
-+if test "${kde_cv_func_mallinfo_field_hblkhd+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_mallinfo_field_hblkhd+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    if test "$cross_compiling" = yes; then
-+  kde_cv_func_mallinfo_field_hblkhd=no
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <$kde_mallinfo_type.h>
-+enum use_type { No, Yes, Never };
-+use_type use_field = No;
-+const int SIZE = 4 * 1024 * 1024;
-+const int SMALL_SIZE = 4 * 1024;
-+
-+void dif( struct mallinfo& m1, struct mallinfo& m2, bool alloc )
-+    {
-+    int difval = m2.hblkhd - m1.hblkhd;
-+    if( alloc )
-+	{
-+	if( difval >= SIZE && difval < 2 * SIZE && use_field != Never )
-+	    use_field = Yes;
-+	}
-+    else // !alloc
-+	{
-+	difval = -difval;
-+	if( difval > SMALL_SIZE && ( difval < SIZE || difval >= 2 * SIZE ) && use_field == Yes )
-+	    use_field = Never;
-+	}
-+    }
-+
-+int main()
-+    {
-+    free( malloc( SIZE * 2 )); // avoid Doug Lea's malloc feature of having total_max in usmblks
-+    struct mallinfo m1 = mallinfo();
-+    void* mem1 = malloc( SIZE );
-+    struct mallinfo m2 = mallinfo();
-+    free( mem1 );
-+    struct mallinfo m3 = mallinfo();
-+    void* mem2[ SIZE / 32 ];
-+    for( int i = 0;
-+	 i < SIZE / 32;
-+	 ++i )
-+	mem2[ i ] = malloc( 32 );
-+    struct mallinfo m4 = mallinfo();
-+    for( int i = 0;
-+	 i < SIZE / 32;
-+	 ++i )
-+	free( mem2[ i ] );
-+    struct mallinfo m5 = mallinfo();
-+    void* mem3[ SIZE / 1024 ];
-+    for( int i = 0;
-+	 i < SIZE / 1024;
-+	 ++i )
-+	mem3[ i ] = malloc( 1024 );
-+    struct mallinfo m6 = mallinfo();
-+    for( int i = 0;
-+	 i < SIZE / 1024;
-+	 ++i )
-+	free( mem3[ i ] );
-+    struct mallinfo m7 = mallinfo();
-+    dif( m1, m2, true );
-+    dif( m2, m3, false );
-+    dif( m3, m4, true );
-+    dif( m4, m5, false );
-+    dif( m5, m6, true );
-+    dif( m6, m7, false );
-+    return use_field == Yes ? 0 : 1;
-+    }
-+
-+
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 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'
+@@ -53833,13 +53313,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -69542,143 +54176,68 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_func_mallinfo_field_hblkhd=yes
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+kde_cv_func_mallinfo_field_hblkhd=no
-+fi
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -53852,8 +53341,10 @@
+ ( exit $ac_status )
+ kde_cv_func_mallinfo_field_hblkhd=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
 +
 +
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -53863,8 +53354,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_hblkhd" >&5
+-echo "${ECHO_T}$kde_cv_func_mallinfo_field_hblkhd" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_hblkhd" >&5
 +echo "${ECHO_T}$kde_cv_func_mallinfo_field_hblkhd" >&6; }
-+kde_mallinfo_hblkhd=$kde_cv_func_mallinfo_field_hblkhd
-+if test "$kde_mallinfo_hblkhd" = "yes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define KDE_MALLINFO_FIELD_hblkhd 1
-+_ACEOF
-+
-+fi
-+
-+
+ kde_mallinfo_hblkhd=$kde_cv_func_mallinfo_field_hblkhd
+ if test "$kde_mallinfo_hblkhd" = "yes"; then
+ 
+@@ -53875,15 +53366,14 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether to use mallinfo field uordblks" >&5
+-echo $ECHO_N "checking whether to use mallinfo field uordblks... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether to use mallinfo field uordblks" >&5
 +echo $ECHO_N "checking whether to use mallinfo field uordblks... $ECHO_C" >&6; }
-+if test "${kde_cv_func_mallinfo_field_uordblks+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_mallinfo_field_uordblks+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    if test "$cross_compiling" = yes; then
-+  kde_cv_func_mallinfo_field_uordblks=no
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <$kde_mallinfo_type.h>
-+enum use_type { No, Yes, Never };
-+use_type use_field = No;
-+const int SIZE = 4 * 1024 * 1024;
-+const int SMALL_SIZE = 4 * 1024;
-+
-+void dif( struct mallinfo& m1, struct mallinfo& m2, bool alloc )
-+    {
-+    int difval = m2.uordblks - m1.uordblks;
-+    if( alloc )
-+	{
-+	if( difval >= SIZE && difval < 2 * SIZE && use_field != Never )
-+	    use_field = Yes;
-+	}
-+    else // !alloc
-+	{
-+	difval = -difval;
-+	if( difval > SMALL_SIZE && ( difval < SIZE || difval >= 2 * SIZE ) && use_field == Yes )
-+	    use_field = Never;
-+	}
-+    }
-+
-+int main()
-+    {
-+    free( malloc( SIZE * 2 )); // avoid Doug Lea's malloc feature of having total_max in usmblks
-+    struct mallinfo m1 = mallinfo();
-+    void* mem1 = malloc( SIZE );
-+    struct mallinfo m2 = mallinfo();
-+    free( mem1 );
-+    struct mallinfo m3 = mallinfo();
-+    void* mem2[ SIZE / 32 ];
-+    for( int i = 0;
-+	 i < SIZE / 32;
-+	 ++i )
-+	mem2[ i ] = malloc( 32 );
-+    struct mallinfo m4 = mallinfo();
-+    for( int i = 0;
-+	 i < SIZE / 32;
-+	 ++i )
-+	free( mem2[ i ] );
-+    struct mallinfo m5 = mallinfo();
-+    void* mem3[ SIZE / 1024 ];
-+    for( int i = 0;
-+	 i < SIZE / 1024;
-+	 ++i )
-+	mem3[ i ] = malloc( 1024 );
-+    struct mallinfo m6 = mallinfo();
-+    for( int i = 0;
-+	 i < SIZE / 1024;
-+	 ++i )
-+	free( mem3[ i ] );
-+    struct mallinfo m7 = mallinfo();
-+    dif( m1, m2, true );
-+    dif( m2, m3, false );
-+    dif( m3, m4, true );
-+    dif( m4, m5, false );
-+    dif( m5, m6, true );
-+    dif( m6, m7, false );
-+    return use_field == Yes ? 0 : 1;
-+    }
-+
-+
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 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'
+@@ -53967,13 +53457,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -69686,143 +54245,68 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_func_mallinfo_field_uordblks=yes
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+kde_cv_func_mallinfo_field_uordblks=no
-+fi
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -53986,8 +53485,10 @@
+ ( exit $ac_status )
+ kde_cv_func_mallinfo_field_uordblks=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
 +
 +
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -53997,8 +53498,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_uordblks" >&5
+-echo "${ECHO_T}$kde_cv_func_mallinfo_field_uordblks" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_uordblks" >&5
 +echo "${ECHO_T}$kde_cv_func_mallinfo_field_uordblks" >&6; }
-+kde_mallinfo_uordblks=$kde_cv_func_mallinfo_field_uordblks
-+if test "$kde_mallinfo_uordblks" = "yes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define KDE_MALLINFO_FIELD_uordblks 1
-+_ACEOF
-+
-+fi
-+
-+
+ kde_mallinfo_uordblks=$kde_cv_func_mallinfo_field_uordblks
+ if test "$kde_mallinfo_uordblks" = "yes"; then
+ 
+@@ -54009,15 +53510,14 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether to use mallinfo field usmblks" >&5
+-echo $ECHO_N "checking whether to use mallinfo field usmblks... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether to use mallinfo field usmblks" >&5
 +echo $ECHO_N "checking whether to use mallinfo field usmblks... $ECHO_C" >&6; }
-+if test "${kde_cv_func_mallinfo_field_usmblks+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
+ if test "${kde_cv_func_mallinfo_field_usmblks+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+    if test "$cross_compiling" = yes; then
-+  kde_cv_func_mallinfo_field_usmblks=no
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+#include <$kde_mallinfo_type.h>
-+enum use_type { No, Yes, Never };
-+use_type use_field = No;
-+const int SIZE = 4 * 1024 * 1024;
-+const int SMALL_SIZE = 4 * 1024;
-+
-+void dif( struct mallinfo& m1, struct mallinfo& m2, bool alloc )
-+    {
-+    int difval = m2.usmblks - m1.usmblks;
-+    if( alloc )
-+	{
-+	if( difval >= SIZE && difval < 2 * SIZE && use_field != Never )
-+	    use_field = Yes;
-+	}
-+    else // !alloc
-+	{
-+	difval = -difval;
-+	if( difval > SMALL_SIZE && ( difval < SIZE || difval >= 2 * SIZE ) && use_field == Yes )
-+	    use_field = Never;
-+	}
-+    }
-+
-+int main()
-+    {
-+    free( malloc( SIZE * 2 )); // avoid Doug Lea's malloc feature of having total_max in usmblks
-+    struct mallinfo m1 = mallinfo();
-+    void* mem1 = malloc( SIZE );
-+    struct mallinfo m2 = mallinfo();
-+    free( mem1 );
-+    struct mallinfo m3 = mallinfo();
-+    void* mem2[ SIZE / 32 ];
-+    for( int i = 0;
-+	 i < SIZE / 32;
-+	 ++i )
-+	mem2[ i ] = malloc( 32 );
-+    struct mallinfo m4 = mallinfo();
-+    for( int i = 0;
-+	 i < SIZE / 32;
-+	 ++i )
-+	free( mem2[ i ] );
-+    struct mallinfo m5 = mallinfo();
-+    void* mem3[ SIZE / 1024 ];
-+    for( int i = 0;
-+	 i < SIZE / 1024;
-+	 ++i )
-+	mem3[ i ] = malloc( 1024 );
-+    struct mallinfo m6 = mallinfo();
-+    for( int i = 0;
-+	 i < SIZE / 1024;
-+	 ++i )
-+	free( mem3[ i ] );
-+    struct mallinfo m7 = mallinfo();
-+    dif( m1, m2, true );
-+    dif( m2, m3, false );
-+    dif( m3, m4, true );
-+    dif( m4, m5, false );
-+    dif( m5, m6, true );
-+    dif( m6, m7, false );
-+    return use_field == Yes ? 0 : 1;
-+    }
-+
-+
-+_ACEOF
-+rm -f conftest$ac_exeext
+ 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'
+@@ -54101,13 +53601,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -69830,111 +54314,70 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_func_mallinfo_field_usmblks=yes
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+kde_cv_func_mallinfo_field_usmblks=no
-+fi
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -54120,8 +53629,10 @@
+ ( exit $ac_status )
+ kde_cv_func_mallinfo_field_usmblks=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
 +
 +
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -54131,8 +53642,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_usmblks" >&5
+-echo "${ECHO_T}$kde_cv_func_mallinfo_field_usmblks" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_usmblks" >&5
 +echo "${ECHO_T}$kde_cv_func_mallinfo_field_usmblks" >&6; }
-+kde_mallinfo_usmblks=$kde_cv_func_mallinfo_field_usmblks
-+if test "$kde_mallinfo_usmblks" = "yes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define KDE_MALLINFO_FIELD_usmblks 1
-+_ACEOF
-+
-+fi
-+
-+    if test -z "$kde_mallinfo_hblkhd" -a \
-+	-z "$kde_mallinfo_uordblks" -a \
-+	-z "$kde_mallinfo_usmblks"; then
-+	kde_mallinfo_type=
-+    fi
-+fi
-+
-+
-+if test "$kde_mallinfo_type" = "stdlib"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define KDE_MALLINFO_STDLIB 1
-+_ACEOF
-+
-+elif test "$kde_mallinfo_type" = "malloc"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define KDE_MALLINFO_MALLOC 1
-+_ACEOF
-+
-+fi
-+
+ kde_mallinfo_usmblks=$kde_cv_func_mallinfo_field_usmblks
+ if test "$kde_mallinfo_usmblks" = "yes"; then
+ 
+@@ -54164,14 +53675,14 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether we can use openpty" >&5
+-echo $ECHO_N "checking whether we can use openpty... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether we can use openpty" >&5
 +echo $ECHO_N "checking whether we can use openpty... $ECHO_C" >&6; }
-+ac_use_openpty="yes"
+ ac_use_openpty="yes"
+-# Check whether --enable-openpty or --disable-openpty was given.
 +# Check whether --enable-openpty was given.
-+if test "${enable_openpty+set}" = set; then
+ if test "${enable_openpty+set}" = set; then
+-  enableval="$enable_openpty"
+-  ac_use_openpty="no"
+-fi;
 +  enableval=$enable_openpty; ac_use_openpty="no"
 +fi
 +
-+if test "$ac_use_openpty" = "yes"; then
-+	kde_safe_LIBS=$LIBS
-+	LIBS="$LIBS $LIBUTIL"
-+	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.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <pty.h>
-+
-+int main(int argc, char* argv) {
-+	int master_fd, slave_fd;
-+	int result;
-+
-+	result = openpty(&master_fd, &slave_fd, 0, 0, 0);
-+
-+	return 0;
-+}
-+
-+_ACEOF
-+rm -f conftest$ac_exeext
+ if test "$ac_use_openpty" = "yes"; then
+ 	kde_safe_LIBS=$LIBS
+ 	LIBS="$LIBS $LIBUTIL"
+@@ -54202,13 +53713,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -69942,120 +54385,115 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_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_use_openpty="yes"
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_use_openpty="no"
-+fi
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -54221,8 +53741,10 @@
+ ( exit $ac_status )
+ ac_use_openpty="no"
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
 +
 +
-+	LIBS=$kde_safe_LIBS
-+fi
-+if test "$ac_use_openpty" = "yes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_OPENPTY 1
-+_ACEOF
-+
+ 	LIBS=$kde_safe_LIBS
+ fi
+ if test "$ac_use_openpty" = "yes"; then
+@@ -54231,21 +53753,21 @@
+ #define HAVE_OPENPTY 1
+ _ACEOF
+ 
+-	echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +	{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+else
+ else
+-	echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +	{ echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
+ fi
+ 
+-echo "$as_me:$LINENO: checking how cwd can be be found by seperate process" >&5
+-echo $ECHO_N "checking how cwd can be be found by seperate process... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking how cwd can be be found by seperate process" >&5
 +echo $ECHO_N "checking how cwd can be be found by seperate process... $ECHO_C" >&6; }
-+case "$host" in
-+  *-*-linux*) cwd_method='proc' ;;
-+	*) cwd_method='no' ;;
-+esac
+ case "$host" in
+   *-*-linux*) cwd_method='proc' ;;
+ 	*) cwd_method='no' ;;
+ esac
+-echo "$as_me:$LINENO: result: $cwd_method" >&5
+-echo "${ECHO_T}$cwd_method" >&6
 +{ echo "$as_me:$LINENO: result: $cwd_method" >&5
 +echo "${ECHO_T}$cwd_method" >&6; }
-+
-+case "$cwd_method" in
-+	proc)
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PROC_CWD 1
-+_ACEOF
-+ ;;
-+esac
-+
-+ac_save_LIBS="$LIBS"
-+LIBS="$LIBS $X_LDFLAGS -lICE"
-+
-+for ac_func in _IceTransNoListen
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ 
+ case "$cwd_method" in
+ 	proc)
+@@ -54261,9 +53783,9 @@
+ for ac_func in _IceTransNoListen
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -54289,68 +53811,60 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -70063,84 +54501,93 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+LIBS="$ac_save_LIBS"
-+
-+LIB_XINERAMA=
-+
-+
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -54364,11 +53878,11 @@
+ LIB_XINERAMA=
+ 
+ 
+-# Check whether --with-xinerama or --without-xinerama was given.
 +# Check whether --with-xinerama was given.
-+if test "${with_xinerama+set}" = set; then
+ if test "${with_xinerama+set}" = set; then
+-  withval="$with_xinerama"
 +  withval=$with_xinerama;
 +fi
-+
-+
-+if test "x$with_xinerama" != "xno"; then
-+  xinerama_save_ldflags="$LDFLAGS"
-+  LDFLAGS="$X_LDFLAGS"
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ 
+-fi;
+ 
+ if test "x$with_xinerama" != "xno"; then
+   xinerama_save_ldflags="$LDFLAGS"
+@@ -54378,8 +53892,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
+ 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'
+@@ -54388,8 +53901,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
 +echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+     #include <X11/Xlib.h>
-+
-+
-+#include <X11/extensions/Xinerama.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -54406,42 +53919,38 @@
+ #include <X11/extensions/Xinerama.h>
+ _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;;
@@ -70148,59 +54595,80 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_X11_extensions_Xinerama_h=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_header_X11_extensions_Xinerama_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_Xinerama_h=no
 +	ac_cv_header_X11_extensions_Xinerama_h=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_header_X11_extensions_Xinerama_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; }
-+if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then
-+
+ if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then
+ 
+-    echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5
+-echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5
 +echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXinerama  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -54454,56 +53963,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XineramaQueryExtension ();
-+int
-+main ()
-+{
+ #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 XineramaQueryExtension ();
+ int
+ main ()
+ {
+-XineramaQueryExtension ();
 +return XineramaQueryExtension ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -70208,209 +54676,136 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_cxx_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
 +  (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_Xinerama_XineramaQueryExtension=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_Xinerama_XineramaQueryExtension=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xinerama_XineramaQueryExtension=no
 +	ac_cv_lib_Xinerama_XineramaQueryExtension=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; }
-+if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_XINERAMA 1
-+_ACEOF
-+
-+	LIB_XINERAMA="-lXinerama -lXext"
-+
-+fi
-+
-+
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+
-+
-+  LDFLAGS="$xinerama_save_ldflags"
-+fi
-+
-+
+ if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then
+ 
+ 
+@@ -54533,8 +54039,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking if ksysguardd can be compiled" >&5
+-echo $ECHO_N "checking if ksysguardd can be compiled... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if ksysguardd can be compiled" >&5
 +echo $ECHO_N "checking if ksysguardd can be compiled... $ECHO_C" >&6; }
-+case "$host" in
-+  *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
-+  *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
-+  *-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
-+  *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
-+  *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
-+  *-*-irix*) ksysguardd_compile=yes; UNAME='Irix' ;;
-+  *-*-openbsd*) ksysguardd_compile=yes; UNAME='OpenBSD' ;;
-+  *) ksysguardd_compile=no; UNAME='' ;;
-+esac
-+
+ case "$host" in
+   *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
+   *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
+@@ -54546,8 +54052,8 @@
+   *) ksysguardd_compile=no; UNAME='' ;;
+ esac
+ 
+-echo "$as_me:$LINENO: result: $ksysguardd_compile" >&5
+-echo "${ECHO_T}$ksysguardd_compile" >&6
 +{ echo "$as_me:$LINENO: result: $ksysguardd_compile" >&5
 +echo "${ECHO_T}$ksysguardd_compile" >&6; }
-+
-+
-+
-+if test "$ksysguardd_compile" = "yes"; then
-+  include_ksysguardd_TRUE=
-+  include_ksysguardd_FALSE='#'
-+else
-+  include_ksysguardd_TRUE='#'
-+  include_ksysguardd_FALSE=
-+fi
-+
-+
-+
-+if test "$UNAME" = Linux; then
-+  include_ksysguardd_linux_TRUE=
-+  include_ksysguardd_linux_FALSE='#'
-+else
-+  include_ksysguardd_linux_TRUE='#'
-+  include_ksysguardd_linux_FALSE=
-+fi
-+
-+
-+
-+if test "$UNAME" = FreeBSD; then
-+  include_ksysguardd_freebsd_TRUE=
-+  include_ksysguardd_freebsd_FALSE='#'
-+else
-+  include_ksysguardd_freebsd_TRUE='#'
-+  include_ksysguardd_freebsd_FALSE=
-+fi
-+
-+
-+
-+if test "$UNAME" = NetBSD; then
-+  include_ksysguardd_netbsd_TRUE=
-+  include_ksysguardd_netbsd_FALSE='#'
-+else
-+  include_ksysguardd_netbsd_TRUE='#'
-+  include_ksysguardd_netbsd_FALSE=
-+fi
-+
-+
-+
-+if test "$UNAME" = Solaris; then
-+  include_ksysguardd_solaris_TRUE=
-+  include_ksysguardd_solaris_FALSE='#'
-+else
-+  include_ksysguardd_solaris_TRUE='#'
-+  include_ksysguardd_solaris_FALSE=
-+fi
-+
-+
-+
-+if test "$UNAME" = Tru64; then
-+  include_ksysguardd_tru64_TRUE=
-+  include_ksysguardd_tru64_FALSE='#'
-+else
-+  include_ksysguardd_tru64_TRUE='#'
-+  include_ksysguardd_tru64_FALSE=
-+fi
-+
-+
-+
-+if test "$UNAME" = Irix; then
-+  include_ksysguardd_irix_TRUE=
-+  include_ksysguardd_irix_FALSE='#'
-+else
-+  include_ksysguardd_irix_TRUE='#'
-+  include_ksysguardd_irix_FALSE=
-+fi
-+
-+
-+
-+if test "$UNAME" = OpenBSD; then
-+  include_ksysguardd_openbsd_TRUE=
-+  include_ksysguardd_openbsd_FALSE='#'
-+else
-+  include_ksysguardd_openbsd_TRUE='#'
-+  include_ksysguardd_openbsd_FALSE=
-+fi
-+
-+
-+
-+
+ 
+ 
+ 
+@@ -54632,23 +54138,22 @@
+ 
+ 
+ 
+-# Check whether --with-sensors or --without-sensors was given.
 +# Check whether --with-sensors was given.
-+if test "${with_sensors+set}" = set; then
+ if test "${with_sensors+set}" = set; then
+-  withval="$with_sensors"
+-
 +  withval=$with_sensors;
-+else
-+  with_sensors=check
+ else
+   with_sensors=check
+-fi;
 +fi
-+
-+
+ 
+-if test "x$with_sensors" != xno; then
+ 
 +if test "x$with_sensors" != xno; then
-+
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+ 
+ 
+ 
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+
-+for ac_header in sensors/sensors.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 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'
+@@ -54661,18 +54166,19 @@
+ for ac_header in sensors/sensors.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -54683,41 +54189,37 @@
+ #include <$ac_header>
+ _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;;
@@ -70418,38 +54813,59 @@
 +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
+   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_cxx_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_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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -54726,24 +54228,22 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -70457,120 +54873,112 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -54751,9 +54251,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -54777,25 +54278,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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+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;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+     kde_save_LDFLAGS="$LDFLAGS"
-+          kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -54824,8 +54319,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for sensors_init in -lsensors" >&5
+-echo $ECHO_N "checking for sensors_init in -lsensors... $ECHO_C" >&6
 +     { echo "$as_me:$LINENO: checking for sensors_init in -lsensors" >&5
 +echo $ECHO_N "checking for sensors_init in -lsensors... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_sensors_sensors_init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsensors  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
+ if test "${ac_cv_lib_sensors_sensors_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -54838,56 +54333,53 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char sensors_init ();
-+int
-+main ()
-+{
+ #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 sensors_init ();
+ int
+ main ()
+ {
+-sensors_init ();
 +return sensors_init ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   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
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -70578,107 +54986,80 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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_sensors_sensors_init=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_lib_sensors_sensors_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_sensors_sensors_init=no
 +	ac_cv_lib_sensors_sensors_init=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_sensors_sensors_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_sensors_sensors_init" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_sensors_sensors_init" >&5
 +echo "${ECHO_T}$ac_cv_lib_sensors_sensors_init" >&6; }
-+if test $ac_cv_lib_sensors_sensors_init = yes; then
-+  LIBSENSORS="-lsensors"
-+fi
-+
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+
-+
-+	if test "x$with_sensors" != xcheck && test -z "$LIBSENSORS"; then
-+        	{ { echo "$as_me:$LINENO: error: --with-sensors was given, but test for lm_sensors failed" >&5
-+echo "$as_me: error: --with-sensors was given, but test for lm_sensors failed" >&2;}
-+   { (exit 1); exit 1; }; }
-+	fi
-+fi
-+
-+case "$UNAME" in
-+	Linux) LIBHOSTS="$LIBSENSORS" ;;
-+	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
-+	Solaris) LIBHOSTS="$LIBSENSORS -lkstat -lsocket" ;;
-+esac
-+
-+
-+
-+
-+
-+if test -f /proc/i8k; then
-+  supports_i8k_TRUE=
-+  supports_i8k_FALSE='#'
-+else
-+  supports_i8k_TRUE='#'
-+  supports_i8k_FALSE=
-+fi
-+
-+
-+#MIN_CONFIG
-+
+ if test $ac_cv_lib_sensors_sensors_init = yes; then
+   LIBSENSORS="-lsensors"
+ fi
+@@ -54924,16 +54416,16 @@
+ 
+ #MIN_CONFIG
+ 
+-# Check whether --enable-dnssd or --disable-dnssd was given.
 +# Check whether --enable-dnssd was given.
-+if test "${enable_dnssd+set}" = set; then
+ if test "${enable_dnssd+set}" = set; then
+-  enableval="$enable_dnssd"
+-  with_dnssd=$enableval
 +  enableval=$enable_dnssd; with_dnssd=$enableval
-+else
-+  with_dnssd=yes
+ else
+   with_dnssd=yes
+-fi;
 +fi
 +
-+if test "$with_dnssd" = "yes"; then
+ if test "$with_dnssd" = "yes"; then
+-echo "$as_me:$LINENO: checking for DNS-SD support" >&5
+-echo $ECHO_N "checking for DNS-SD support... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for DNS-SD support" >&5
 +echo $ECHO_N "checking for DNS-SD support... $ECHO_C" >&6; }
-+save_dnssdtest_LIBS="$LIBS"
-+save_dnssdtest_LDFLAGS="$LDFLAGS"
-+save_dnssdtest_CPPFLAGS="$CPPFLAGS"
-+LDFLAGS="$all_libraries $LDFLAGS"
-+CPPFLAGS="$CPPFLAGS $all_includes"
-+case $host_os in
-+  darwin*) LIBS="" ;;
-+  *) LIBS="-ldns_sd" ;;
-+esac
-+have_libdns_sd="no"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+			#include <dns_sd.h>
-+
-+int
-+main ()
-+{
-+
-+			DNSServiceRefDeallocate( (DNSServiceRef) 0);
-+			TXTRecordDeallocate( (TXTRecordRef*) 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ save_dnssdtest_LIBS="$LIBS"
+ save_dnssdtest_LDFLAGS="$LDFLAGS"
+ save_dnssdtest_CPPFLAGS="$CPPFLAGS"
+@@ -54965,27 +54457,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -70686,95 +55067,91 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&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_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
 +  (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
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_DNSSD 1
-+_ACEOF
-+
-+			case $host_os in
-+				darwin*) LIB_DNSSD="" ;;
-+				*) LIB_DNSSD="-ldns_sd" ;;
-+			esac
-+			have_libdns_sd="yes"
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -54997,20 +54485,21 @@
+ 				*) LIB_DNSSD="-ldns_sd" ;;
+ 			esac
+ 			have_libdns_sd="yes"
+-			echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +			{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-			echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +			{ echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+                        LIB_DNSSD=""
+                         LIB_DNSSD=""
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+fi
-+
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+CPPFLAGS=$save_dnssdtest_CPPFLAGS
-+LDFLAGS=$save_dnssdtest_LDFLAGS
-+LIBS=$save_dnssdtest_LIBS
-+fi
-+
-+
-+
-+if test "$have_libdns_sd" = "yes"; then
-+  HAVE_DNSSD_TRUE=
-+  HAVE_DNSSD_FALSE='#'
-+else
-+  HAVE_DNSSD_TRUE='#'
-+  HAVE_DNSSD_FALSE=
-+fi
-+
-+
-+if test "x$with_composite" != "xno"; then
-+
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
+       conftest$ac_exeext conftest.$ac_ext
+ CPPFLAGS=$save_dnssdtest_CPPFLAGS
+ LDFLAGS=$save_dnssdtest_LDFLAGS
+@@ -55033,10 +54522,9 @@
+ 
+ 
+ 
+-
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+
-+for ac_header in X11/extensions/Xdamage.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 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'
+@@ -55049,9 +54537,9 @@
+ for ac_header in X11/extensions/Xdamage.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -55065,38 +54553,35 @@
+ #include <$ac_header>
+ _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;;
@@ -70782,82 +55159,96 @@
 +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
+   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_cxx_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_cxx_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=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
+ 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: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +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_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+  compile_kompmgr=no
-+fi
-+
-+done
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -55120,10 +54605,9 @@
+ 
+ 
+ 
+-
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+
-+for ac_header in X11/extensions/Xcomposite.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 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'
+@@ -55136,9 +54620,9 @@
+ for ac_header in X11/extensions/Xcomposite.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -55152,38 +54636,35 @@
+ #include <$ac_header>
+ _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_cxx_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
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -70865,82 +55256,67 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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
-+  eval "$as_ac_Header=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   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
+ 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: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +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_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+  compile_kompmgr=no
-+fi
-+
-+done
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -55207,10 +54688,9 @@
+ 
+ 
+ 
+-
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+
-+for ac_header in X11/extensions/Xrender.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 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'
+@@ -55223,9 +54703,9 @@
+ for ac_header in X11/extensions/Xrender.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -55239,38 +54719,35 @@
+ #include <$ac_header>
+ _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;;
@@ -70948,97 +55324,89 @@
 +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
+   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_cxx_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_cxx_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=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
+ 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: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +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_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+  compile_kompmgr=no
-+fi
-+
-+done
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+else
-+  compile_kompmgr=no
-+fi
-+
-+
-+if test x"$compile_kompmgr" != x"no" ; then
-+  include_kompmgr_TRUE=
-+  include_kompmgr_FALSE='#'
-+else
-+  include_kompmgr_TRUE='#'
-+  include_kompmgr_FALSE=
-+fi
-+
-+
-+# add this here so the test programs below compile
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -55309,8 +54786,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
-+   if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
+ 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'
+@@ -55320,17 +54796,17 @@
+ 
+ 
+    if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
+-echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
 +echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/Xlib.h usability" >&5
+-echo $ECHO_N "checking X11/Xlib.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X11/Xlib.h usability" >&5
 +echo $ECHO_N "checking X11/Xlib.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <X11/Xlib.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -55341,41 +54817,37 @@
+ #include <X11/Xlib.h>
+ _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;;
@@ -71046,38 +55414,59 @@
 +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
+   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_cxx_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_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
-+
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking X11/Xlib.h presence" >&5
+-echo $ECHO_N "checking X11/Xlib.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking X11/Xlib.h presence" >&5
 +echo $ECHO_N "checking X11/Xlib.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -55384,24 +54856,22 @@
+ /* end confdefs.h.  */
+ #include <X11/Xlib.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -71085,104 +55474,100 @@
 +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
+   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; 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
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -55409,9 +54879,10 @@
+ 
+   ac_header_preproc=no
+ fi
 +
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -55435,25 +54906,18 @@
+ echo "$as_me: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: X11/Xlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: X11/Xlib.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: X11/Xlib.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/Xlib.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: X11/Xlib.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: X11/Xlib.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/Xlib.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: X11/Xlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
+-echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
 +echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_X11_Xlib_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_Xlib_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; }
-+
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ 
+ fi
+ 
+@@ -55470,8 +54934,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
+ 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'
+@@ -55480,8 +54943,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
 +echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <X11/Xlib.h>
-+
-+
-+#include <X11/extensions/XKBstr.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -55498,38 +54961,34 @@
+ #include <X11/extensions/XKBstr.h>
+ _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;;
@@ -71190,75 +55575,75 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_X11_extensions_XKBstr_h=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_header_X11_extensions_XKBstr_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_XKBstr_h=no
 +	ac_cv_header_X11_extensions_XKBstr_h=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_header_X11_extensions_XKBstr_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6; }
-+if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
-+  :
-+else
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE kxkb"
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+ if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
+   :
+ else
+@@ -55549,8 +55008,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
 +    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
-+
-+
+ 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'
+@@ -55559,8 +55017,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/XKBrules.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XKBrules.h... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for X11/extensions/XKBrules.h" >&5
 +echo $ECHO_N "checking for X11/extensions/XKBrules.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_extensions_XKBrules_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <stdio.h>
-+#include <X11/Xlib.h>
-+#include <X11/XKBlib.h>
-+
-+
-+#include <X11/extensions/XKBrules.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_header_X11_extensions_XKBrules_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -55579,38 +55037,34 @@
+ #include <X11/extensions/XKBrules.h>
+ _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;;
@@ -71266,1537 +55651,79 @@
 +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
+   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_cxx_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_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  ac_cv_header_X11_extensions_XKBrules_h=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_cv_header_X11_extensions_XKBrules_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_XKBrules_h=no
 +	ac_cv_header_X11_extensions_XKBrules_h=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_header_X11_extensions_XKBrules_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBrules_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBrules_h" >&5
 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBrules_h" >&6; }
-+if test $ac_cv_header_X11_extensions_XKBrules_h = yes; then
-+  :
-+else
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE kxkb"
-+fi
-+
-+
-+   ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+   CPPFLAGS=$kde_safe_cppflags
-+
-+
-+
-+DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
-+TOPSUBDIRS=""
-+
-+if test ! -s $srcdir/subdirs; then
-+    files=`cd $srcdir && ls -1`
-+  dirs=`for i in $files; do if test -d $i; then echo $i; fi; done`
-+  for i in $dirs; do
-+    echo $i >> $srcdir/subdirs
-+  done
-+fi
-+
-+ac_topsubdirs=
-+if test -s $srcdir/inst-apps; then
-+  ac_topsubdirs="`cat $srcdir/inst-apps`"
-+elif test -s $srcdir/subdirs; then
-+  ac_topsubdirs="`cat $srcdir/subdirs`"
-+fi
-+
-+for i in $ac_topsubdirs; do
+ if test $ac_cv_header_X11_extensions_XKBrules_h = yes; then
+   :
+ else
+@@ -55647,8 +55101,8 @@
+ fi
+ 
+ for i in $ac_topsubdirs; do
+-  echo "$as_me:$LINENO: checking if $i should be compiled" >&5
+-echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking if $i should be compiled" >&5
 +echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; }
-+  if test -d $srcdir/$i; then
-+    install_it="yes"
-+    for j in $DO_NOT_COMPILE; do
-+      if test $i = $j; then
-+        install_it="no"
-+      fi
-+    done
-+  else
-+    install_it="no"
-+  fi
+   if test -d $srcdir/$i; then
+     install_it="yes"
+     for j in $DO_NOT_COMPILE; do
+@@ -55659,8 +55113,8 @@
+   else
+     install_it="no"
+   fi
+-  echo "$as_me:$LINENO: result: $install_it" >&5
+-echo "${ECHO_T}$install_it" >&6
 +  { echo "$as_me:$LINENO: result: $install_it" >&5
 +echo "${ECHO_T}$install_it" >&6; }
-+  vari=`echo $i | sed -e 's,[-+.@],_,g'`
-+  if test $install_it = "yes"; then
-+    TOPSUBDIRS="$TOPSUBDIRS $i"
-+    eval "$vari""_SUBDIR_included=yes"
-+  else
-+    eval "$vari""_SUBDIR_included=no"
-+  fi
-+done
-+
-+
-+
-+
-+
-+if test "x$libkonq_SUBDIR_included" = xyes; then
-+  libkonq_SUBDIR_included_TRUE=
-+  libkonq_SUBDIR_included_FALSE='#'
-+else
-+  libkonq_SUBDIR_included_TRUE='#'
-+  libkonq_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$applnk_SUBDIR_included" = xyes; then
-+  applnk_SUBDIR_included_TRUE=
-+  applnk_SUBDIR_included_FALSE='#'
-+else
-+  applnk_SUBDIR_included_TRUE='#'
-+  applnk_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$doc_SUBDIR_included" = xyes; then
-+  doc_SUBDIR_included_TRUE=
-+  doc_SUBDIR_included_FALSE='#'
-+else
-+  doc_SUBDIR_included_TRUE='#'
-+  doc_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$drkonqi_SUBDIR_included" = xyes; then
-+  drkonqi_SUBDIR_included_TRUE=
-+  drkonqi_SUBDIR_included_FALSE='#'
-+else
-+  drkonqi_SUBDIR_included_TRUE='#'
-+  drkonqi_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kappfinder_SUBDIR_included" = xyes; then
-+  kappfinder_SUBDIR_included_TRUE=
-+  kappfinder_SUBDIR_included_FALSE='#'
-+else
-+  kappfinder_SUBDIR_included_TRUE='#'
-+  kappfinder_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kate_SUBDIR_included" = xyes; then
-+  kate_SUBDIR_included_TRUE=
-+  kate_SUBDIR_included_FALSE='#'
-+else
-+  kate_SUBDIR_included_TRUE='#'
-+  kate_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kcheckpass_SUBDIR_included" = xyes; then
-+  kcheckpass_SUBDIR_included_TRUE=
-+  kcheckpass_SUBDIR_included_FALSE='#'
-+else
-+  kcheckpass_SUBDIR_included_TRUE='#'
-+  kcheckpass_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kcminit_SUBDIR_included" = xyes; then
-+  kcminit_SUBDIR_included_TRUE=
-+  kcminit_SUBDIR_included_FALSE='#'
-+else
-+  kcminit_SUBDIR_included_TRUE='#'
-+  kcminit_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kdcop_SUBDIR_included" = xyes; then
-+  kdcop_SUBDIR_included_TRUE=
-+  kdcop_SUBDIR_included_FALSE='#'
-+else
-+  kdcop_SUBDIR_included_TRUE='#'
-+  kdcop_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kdebugdialog_SUBDIR_included" = xyes; then
-+  kdebugdialog_SUBDIR_included_TRUE=
-+  kdebugdialog_SUBDIR_included_FALSE='#'
-+else
-+  kdebugdialog_SUBDIR_included_TRUE='#'
-+  kdebugdialog_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kdeeject_SUBDIR_included" = xyes; then
-+  kdeeject_SUBDIR_included_TRUE=
-+  kdeeject_SUBDIR_included_FALSE='#'
-+else
-+  kdeeject_SUBDIR_included_TRUE='#'
-+  kdeeject_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kdepasswd_SUBDIR_included" = xyes; then
-+  kdepasswd_SUBDIR_included_TRUE=
-+  kdepasswd_SUBDIR_included_FALSE='#'
-+else
-+  kdepasswd_SUBDIR_included_TRUE='#'
-+  kdepasswd_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kdeprint_SUBDIR_included" = xyes; then
-+  kdeprint_SUBDIR_included_TRUE=
-+  kdeprint_SUBDIR_included_FALSE='#'
-+else
-+  kdeprint_SUBDIR_included_TRUE='#'
-+  kdeprint_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kdesu_SUBDIR_included" = xyes; then
-+  kdesu_SUBDIR_included_TRUE=
-+  kdesu_SUBDIR_included_FALSE='#'
-+else
-+  kdesu_SUBDIR_included_TRUE='#'
-+  kdesu_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kdialog_SUBDIR_included" = xyes; then
-+  kdialog_SUBDIR_included_TRUE=
-+  kdialog_SUBDIR_included_FALSE='#'
-+else
-+  kdialog_SUBDIR_included_TRUE='#'
-+  kdialog_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kdmlib_SUBDIR_included" = xyes; then
-+  kdmlib_SUBDIR_included_TRUE=
-+  kdmlib_SUBDIR_included_FALSE='#'
-+else
-+  kdmlib_SUBDIR_included_TRUE='#'
-+  kdmlib_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kfind_SUBDIR_included" = xyes; then
-+  kfind_SUBDIR_included_TRUE=
-+  kfind_SUBDIR_included_FALSE='#'
-+else
-+  kfind_SUBDIR_included_TRUE='#'
-+  kfind_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$khelpcenter_SUBDIR_included" = xyes; then
-+  khelpcenter_SUBDIR_included_TRUE=
-+  khelpcenter_SUBDIR_included_FALSE='#'
-+else
-+  khelpcenter_SUBDIR_included_TRUE='#'
-+  khelpcenter_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$khotkeys_SUBDIR_included" = xyes; then
-+  khotkeys_SUBDIR_included_TRUE=
-+  khotkeys_SUBDIR_included_FALSE='#'
-+else
-+  khotkeys_SUBDIR_included_TRUE='#'
-+  khotkeys_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kioslave_SUBDIR_included" = xyes; then
-+  kioslave_SUBDIR_included_TRUE=
-+  kioslave_SUBDIR_included_FALSE='#'
-+else
-+  kioslave_SUBDIR_included_TRUE='#'
-+  kioslave_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$klipper_SUBDIR_included" = xyes; then
-+  klipper_SUBDIR_included_TRUE=
-+  klipper_SUBDIR_included_FALSE='#'
-+else
-+  klipper_SUBDIR_included_TRUE='#'
-+  klipper_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kmenuedit_SUBDIR_included" = xyes; then
-+  kmenuedit_SUBDIR_included_TRUE=
-+  kmenuedit_SUBDIR_included_FALSE='#'
-+else
-+  kmenuedit_SUBDIR_included_TRUE='#'
-+  kmenuedit_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$knetattach_SUBDIR_included" = xyes; then
-+  knetattach_SUBDIR_included_TRUE=
-+  knetattach_SUBDIR_included_FALSE='#'
-+else
-+  knetattach_SUBDIR_included_TRUE='#'
-+  knetattach_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$konsole_SUBDIR_included" = xyes; then
-+  konsole_SUBDIR_included_TRUE=
-+  konsole_SUBDIR_included_FALSE='#'
-+else
-+  konsole_SUBDIR_included_TRUE='#'
-+  konsole_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kpager_SUBDIR_included" = xyes; then
-+  kpager_SUBDIR_included_TRUE=
-+  kpager_SUBDIR_included_FALSE='#'
-+else
-+  kpager_SUBDIR_included_TRUE='#'
-+  kpager_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kpersonalizer_SUBDIR_included" = xyes; then
-+  kpersonalizer_SUBDIR_included_TRUE=
-+  kpersonalizer_SUBDIR_included_FALSE='#'
-+else
-+  kpersonalizer_SUBDIR_included_TRUE='#'
-+  kpersonalizer_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kreadconfig_SUBDIR_included" = xyes; then
-+  kreadconfig_SUBDIR_included_TRUE=
-+  kreadconfig_SUBDIR_included_FALSE='#'
-+else
-+  kreadconfig_SUBDIR_included_TRUE='#'
-+  kreadconfig_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kscreensaver_SUBDIR_included" = xyes; then
-+  kscreensaver_SUBDIR_included_TRUE=
-+  kscreensaver_SUBDIR_included_FALSE='#'
-+else
-+  kscreensaver_SUBDIR_included_TRUE='#'
-+  kscreensaver_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$ksplashml_SUBDIR_included" = xyes; then
-+  ksplashml_SUBDIR_included_TRUE=
-+  ksplashml_SUBDIR_included_FALSE='#'
-+else
-+  ksplashml_SUBDIR_included_TRUE='#'
-+  ksplashml_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kstart_SUBDIR_included" = xyes; then
-+  kstart_SUBDIR_included_TRUE=
-+  kstart_SUBDIR_included_FALSE='#'
-+else
-+  kstart_SUBDIR_included_TRUE='#'
-+  kstart_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$ksysguard_SUBDIR_included" = xyes; then
-+  ksysguard_SUBDIR_included_TRUE=
-+  ksysguard_SUBDIR_included_FALSE='#'
-+else
-+  ksysguard_SUBDIR_included_TRUE='#'
-+  ksysguard_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$ksystraycmd_SUBDIR_included" = xyes; then
-+  ksystraycmd_SUBDIR_included_TRUE=
-+  ksystraycmd_SUBDIR_included_FALSE='#'
-+else
-+  ksystraycmd_SUBDIR_included_TRUE='#'
-+  ksystraycmd_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$ktip_SUBDIR_included" = xyes; then
-+  ktip_SUBDIR_included_TRUE=
-+  ktip_SUBDIR_included_FALSE='#'
-+else
-+  ktip_SUBDIR_included_TRUE='#'
-+  ktip_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kwin_SUBDIR_included" = xyes; then
-+  kwin_SUBDIR_included_TRUE=
-+  kwin_SUBDIR_included_FALSE='#'
-+else
-+  kwin_SUBDIR_included_TRUE='#'
-+  kwin_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kxkb_SUBDIR_included" = xyes; then
-+  kxkb_SUBDIR_included_TRUE=
-+  kxkb_SUBDIR_included_FALSE='#'
-+else
-+  kxkb_SUBDIR_included_TRUE='#'
-+  kxkb_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$l10n_SUBDIR_included" = xyes; then
-+  l10n_SUBDIR_included_TRUE=
-+  l10n_SUBDIR_included_FALSE='#'
-+else
-+  l10n_SUBDIR_included_TRUE='#'
-+  l10n_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$nsplugins_SUBDIR_included" = xyes; then
-+  nsplugins_SUBDIR_included_TRUE=
-+  nsplugins_SUBDIR_included_FALSE='#'
-+else
-+  nsplugins_SUBDIR_included_TRUE='#'
-+  nsplugins_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$pics_SUBDIR_included" = xyes; then
-+  pics_SUBDIR_included_TRUE=
-+  pics_SUBDIR_included_FALSE='#'
-+else
-+  pics_SUBDIR_included_TRUE='#'
-+  pics_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$konqueror_SUBDIR_included" = xyes; then
-+  konqueror_SUBDIR_included_TRUE=
-+  konqueror_SUBDIR_included_FALSE='#'
-+else
-+  konqueror_SUBDIR_included_TRUE='#'
-+  konqueror_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$ksmserver_SUBDIR_included" = xyes; then
-+  ksmserver_SUBDIR_included_TRUE=
-+  ksmserver_SUBDIR_included_FALSE='#'
-+else
-+  ksmserver_SUBDIR_included_TRUE='#'
-+  ksmserver_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kicker_SUBDIR_included" = xyes; then
-+  kicker_SUBDIR_included_TRUE=
-+  kicker_SUBDIR_included_FALSE='#'
-+else
-+  kicker_SUBDIR_included_TRUE='#'
-+  kicker_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kcontrol_SUBDIR_included" = xyes; then
-+  kcontrol_SUBDIR_included_TRUE=
-+  kcontrol_SUBDIR_included_FALSE='#'
-+else
-+  kcontrol_SUBDIR_included_TRUE='#'
-+  kcontrol_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kdesktop_SUBDIR_included" = xyes; then
-+  kdesktop_SUBDIR_included_TRUE=
-+  kdesktop_SUBDIR_included_FALSE='#'
-+else
-+  kdesktop_SUBDIR_included_TRUE='#'
-+  kdesktop_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
-+if test "x$kdm_SUBDIR_included" = xyes; then
-+  kdm_SUBDIR_included_TRUE=
-+  kdm_SUBDIR_included_FALSE='#'
-+else
-+  kdm_SUBDIR_included_TRUE='#'
-+  kdm_SUBDIR_included_FALSE=
-+fi
-+
-+ac_config_files="$ac_config_files Makefile"
-+
-+ac_config_files="$ac_config_files applnk/Makefile"
-+
-+ac_config_files="$ac_config_files applnk/compat/Makefile"
-+
-+ac_config_files="$ac_config_files doc/Makefile"
-+
-+ac_config_files="$ac_config_files doc/faq/Makefile"
-+
-+ac_config_files="$ac_config_files doc/glossary/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kappfinder/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kate/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/arts/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/background/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/bell/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/cache/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/clock/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/colors/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/cookies/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/crypto/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/desktop/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/desktopbehavior/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/ebrowsing/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/email/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/energy/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/filemanager/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/filetypes/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/fonts/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/helpindex/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/icons/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/kcmaccess/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/kcmcss/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/kcmfontinst/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/kcmkonsole/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/kcmlaunch/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/kcmnotify/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/kcmsmserver/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/kcmstyle/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/kcmtaskbar/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/kdm/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/keyboard/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/keys/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/khtml/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/kwindecoration/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/language/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/mouse/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/netpref/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/panel/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/panelappearance/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/passwords/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/performance/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/proxy/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/screensaver/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/smb/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/spellchecking/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/useragent/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kcontrol/windowmanagement/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kdcop/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kdebugdialog/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kdeprint/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kdesu/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kdm/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kfind/Makefile"
-+
-+ac_config_files="$ac_config_files doc/khelpcenter/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kicker/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/cdinfo/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/devices/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/dma/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/interrupts/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/ioports/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/memory/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/nics/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/opengl/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/partitions/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/pci/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/pcmcia/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/processor/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/protocols/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/samba/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/scsi/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/sound/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/usb/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kinfocenter/xserver/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kioslave/Makefile"
-+
-+ac_config_files="$ac_config_files doc/klipper/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kmenuedit/Makefile"
-+
-+ac_config_files="$ac_config_files doc/knetattach/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kompmgr/Makefile"
-+
-+ac_config_files="$ac_config_files doc/konqueror/Makefile"
-+
-+ac_config_files="$ac_config_files doc/konsole/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kpager/Makefile"
-+
-+ac_config_files="$ac_config_files doc/ksplashml/Makefile"
-+
-+ac_config_files="$ac_config_files doc/ksysguard/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kwrite/Makefile"
-+
-+ac_config_files="$ac_config_files doc/kxkb/Makefile"
-+
-+ac_config_files="$ac_config_files doc/quickstart/Makefile"
-+
-+ac_config_files="$ac_config_files doc/userguide/Makefile"
-+
-+ac_config_files="$ac_config_files doc/visualdict/Makefile"
-+
-+ac_config_files="$ac_config_files drkonqi/Makefile"
-+
-+ac_config_files="$ac_config_files drkonqi/debuggers/Makefile"
-+
-+ac_config_files="$ac_config_files drkonqi/pics/Makefile"
-+
-+ac_config_files="$ac_config_files drkonqi/presets/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Development/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Games/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Games/Arcade/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Games/Board/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Games/Card/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Games/Emulators/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Games/Roguelikes/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Games/TacticStrategy/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Games/Toys/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Graphics/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Internet/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Internet/Terminal/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Multimedia/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Office/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/System/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/System/Terminal/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Utilities/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Utilities/Editors/Makefile"
-+
-+ac_config_files="$ac_config_files kappfinder/apps/Utilities/xutils/Makefile"
-+
-+ac_config_files="$ac_config_files kate/Makefile"
-+
-+ac_config_files="$ac_config_files kate/app/Makefile"
-+
-+ac_config_files="$ac_config_files kate/data/Makefile"
-+
-+ac_config_files="$ac_config_files kate/interfaces/Makefile"
-+
-+ac_config_files="$ac_config_files kate/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kate/pics/actions/Makefile"
-+
-+ac_config_files="$ac_config_files kate/utils/Makefile"
-+
-+ac_config_files="$ac_config_files kcheckpass/Makefile"
-+
-+ac_config_files="$ac_config_files kcminit/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/access/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/accessibility/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/arts/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/background/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/background/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/bell/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/clock/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/colors/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/componentchooser/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/componentchooser/componentservices/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/crypto/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/css/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/display/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/dnssd/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/ebrowsing/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/ebrowsing/plugins/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/ebrowsing/plugins/ikws/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/ebrowsing/plugins/localdomain/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/ebrowsing/plugins/shorturi/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/energy/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/energy/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/filetypes/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/fonts/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/icons/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/info/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/input/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/input/core/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/input/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/input/xcursor/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/ioslaveinfo/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/joystick/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kcontrol/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kcontrol/about/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kded/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kdm/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/keys/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kfontinst/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kfontinst/kcmfontinst/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kfontinst/kfile-plugin/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kfontinst/kfontinst/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kfontinst/kio/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kfontinst/lib/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kfontinst/thumbnail/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kfontinst/viewpart/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kicker/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kio/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kio/uasproviders/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/knotify/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/knotify/sounds/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/konq/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/konqhtml/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/konsole/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/ad/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/kcs/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/HighContrastDark/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/HighContrastDark-big/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/HighContrastLight/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/HighContrastLight-big/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/KDE_Classic/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/Keramik/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/Plastik/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/Platinum/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/Redmond/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/Sunshine/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/YellowOnBlue/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/krdb/themes/YellowOnBlue-big/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/kthememanager/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/launch/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/locale/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/locale/default/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/locale/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/nics/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/performance/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/privacy/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/randr/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/samba/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/screensaver/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/smartcard/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/smserver/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/spellchecking/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/style/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/style/keramik/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/taskbar/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/usbview/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/view1394/Makefile"
-+
-+ac_config_files="$ac_config_files kcontrol/xinerama/Makefile"
-+
-+ac_config_files="$ac_config_files kdcop/Makefile"
-+
-+ac_config_files="$ac_config_files kdebugdialog/Makefile"
-+
-+ac_config_files="$ac_config_files kdeeject/Makefile"
-+
-+ac_config_files="$ac_config_files kdepasswd/Makefile"
-+
-+ac_config_files="$ac_config_files kdepasswd/kcm/Makefile"
-+
-+ac_config_files="$ac_config_files kdepasswd/kcm/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kdeprint/Makefile"
-+
-+ac_config_files="$ac_config_files kdeprint/descriptions/Makefile"
-+
-+ac_config_files="$ac_config_files kdeprint/kdeprint_part/Makefile"
-+
-+ac_config_files="$ac_config_files kdeprint/kdeprintfax/Makefile"
-+
-+ac_config_files="$ac_config_files kdeprint/kjobviewer/Makefile"
-+
-+ac_config_files="$ac_config_files kdeprint/kprinter/Makefile"
-+
-+ac_config_files="$ac_config_files kdeprint/printmgr/Makefile"
-+
-+ac_config_files="$ac_config_files kdeprint/slave/Makefile"
-+
-+ac_config_files="$ac_config_files kdeprint/slave/mimetypes/Makefile"
-+
-+ac_config_files="$ac_config_files kdeprint/slave/templates/Makefile"
-+
-+ac_config_files="$ac_config_files kdesktop/Makefile"
-+
-+ac_config_files="$ac_config_files kdesktop/init/Makefile"
-+
-+ac_config_files="$ac_config_files kdesktop/init/Templates/Makefile"
-+
-+ac_config_files="$ac_config_files kdesktop/kwebdesktop/Makefile"
-+
-+ac_config_files="$ac_config_files kdesktop/lock/Makefile"
-+
-+ac_config_files="$ac_config_files kdesktop/patterns/Makefile"
-+
-+ac_config_files="$ac_config_files kdesktop/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kdesktop/programs/Makefile"
-+
-+ac_config_files="$ac_config_files kdesu/Makefile"
-+
-+ac_config_files="$ac_config_files kdesu/kdesu/Makefile"
-+
-+ac_config_files="$ac_config_files kdesu/kdesud/Makefile"
-+
-+ac_config_files="$ac_config_files kdialog/Makefile"
-+
-+ac_config_files="$ac_config_files kdm/Makefile"
-+
-+ac_config_files="$ac_config_files kdm/backend/Makefile"
-+
-+ac_config_files="$ac_config_files kdm/kfrontend/Makefile"
-+
-+ac_config_files="$ac_config_files kdm/kfrontend/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kdm/kfrontend/sessions/Makefile"
-+
-+ac_config_files="$ac_config_files kdm/kfrontend/themer/Makefile"
-+
-+ac_config_files="$ac_config_files kdm/kfrontend/themes/Makefile"
-+
-+ac_config_files="$ac_config_files kdm/kfrontend/themes/circles/Makefile"
-+
-+ac_config_files="$ac_config_files kdmlib/Makefile"
-+
-+ac_config_files="$ac_config_files kfind/Makefile"
-+
-+ac_config_files="$ac_config_files kfind/pics/Makefile"
-+
-+ac_config_files="$ac_config_files khelpcenter/Makefile"
-+
-+ac_config_files="$ac_config_files khelpcenter/htmlsearch/Makefile"
-+
-+ac_config_files="$ac_config_files khelpcenter/pics/Makefile"
-+
-+ac_config_files="$ac_config_files khelpcenter/plugins/Makefile"
-+
-+ac_config_files="$ac_config_files khelpcenter/plugins/Applications/Makefile"
-+
-+ac_config_files="$ac_config_files khelpcenter/plugins/Manpages/Makefile"
-+
-+ac_config_files="$ac_config_files khelpcenter/plugins/Scrollkeeper/Makefile"
-+
-+ac_config_files="$ac_config_files khelpcenter/plugins/Tutorials/Makefile"
-+
-+ac_config_files="$ac_config_files khelpcenter/searchhandlers/Makefile"
-+
-+ac_config_files="$ac_config_files khotkeys/Makefile"
-+
-+ac_config_files="$ac_config_files khotkeys/app/Makefile"
-+
-+ac_config_files="$ac_config_files khotkeys/arts/Makefile"
-+
-+ac_config_files="$ac_config_files khotkeys/data/Makefile"
-+
-+ac_config_files="$ac_config_files khotkeys/kcontrol/Makefile"
-+
-+ac_config_files="$ac_config_files khotkeys/kcontrol/ui/Makefile"
-+
-+ac_config_files="$ac_config_files khotkeys/shared/Makefile"
-+
-+ac_config_files="$ac_config_files khotkeys/update/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/clock/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/launcher/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/lockout/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/media/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/menu/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/minipager/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/naughty/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/run/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/swallow/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/systemtray/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/taskbar/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/applets/trash/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/data/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/data/app_start_anim/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/data/icons/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/data/icons/actions/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/data/kmenu_side/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/data/tiles/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/data/wallpaper/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/extensions/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/extensions/dockbar/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/extensions/kasbar/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/extensions/sidebar/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/extensions/taskbar/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/kicker/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/kicker/buttons/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/kicker/core/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/kicker/ui/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/libkicker/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/menuext/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/menuext/find/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/menuext/kate/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/menuext/kdeprint/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/menuext/konq-profiles/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/menuext/konsole/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/menuext/prefmenu/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/menuext/recentdocs/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/menuext/remote/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/menuext/system/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/menuext/tom/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/proxy/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/taskbar/Makefile"
-+
-+ac_config_files="$ac_config_files kicker/taskmanager/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/about/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/cgi/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/cgi/kcmcgi/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/filter/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/finger/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/fish/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/floppy/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/home/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/home/kdedmodule/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/info/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/ldap/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/mac/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/man/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/media/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/media/kcmodule/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/media/kfile-plugin/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/media/libmediacommon/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/media/mediamanager/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/media/medianotifier/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/media/mimetypes/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/media/mounthelper/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/media/propsdlgplugin/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/media/services/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/nfs/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/nntp/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/pop3/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/remote/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/remote/kdedmodule/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/settings/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/sftp/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/smb/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/smtp/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/system/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/system/entries/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/system/kdedmodule/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/system/mimetypes/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/tar/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/thumbnail/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/trash/Makefile"
-+
-+ac_config_files="$ac_config_files kioslave/trash/kfile-plugin/Makefile"
-+
-+ac_config_files="$ac_config_files klipper/Makefile"
-+
-+ac_config_files="$ac_config_files kmenuedit/Makefile"
-+
-+ac_config_files="$ac_config_files kmenuedit/pixmaps/Makefile"
-+
-+ac_config_files="$ac_config_files knetattach/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/about/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/client/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/iconview/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/keditbookmarks/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/kttsplugin/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/listview/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/pics/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/pics/actions/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/pics/indicators/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/pics/tiles/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/preloader/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/quickprint/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/remoteencodingplugin/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/shellcmdplugin/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/sidebar/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/sidebar/test/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/sidebar/trees/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/sidebar/trees/bookmark_module/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/sidebar/trees/dirtree_module/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/sidebar/trees/history_module/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/sidebar/trees/init/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/sidebar/trees/init/remote/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/sidebar/trees/init/remote/ftp/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/sidebar/trees/init/remote/web/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/sidebar/trees/init/services/Makefile"
-+
-+ac_config_files="$ac_config_files konqueror/sidebar/web_module/Makefile"
-+
-+ac_config_files="$ac_config_files konsole/Makefile"
-+
-+ac_config_files="$ac_config_files konsole/doc/Makefile"
-+
-+ac_config_files="$ac_config_files konsole/doc/VT100/Makefile"
-+
-+ac_config_files="$ac_config_files konsole/fonts/Makefile"
-+
-+ac_config_files="$ac_config_files konsole/konsole/Makefile"
-+
-+ac_config_files="$ac_config_files konsole/other/Makefile"
-+
-+ac_config_files="$ac_config_files konsole/other/icons/Makefile"
-+
-+ac_config_files="$ac_config_files konsole/other/wallpapers/Makefile"
-+
-+ac_config_files="$ac_config_files kpager/Makefile"
-+
-+ac_config_files="$ac_config_files kpersonalizer/Makefile"
-+
-+ac_config_files="$ac_config_files kpersonalizer/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kreadconfig/Makefile"
-+
-+ac_config_files="$ac_config_files kscreensaver/Makefile"
-+
-+ac_config_files="$ac_config_files ksmserver/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/kcmksplash/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/kcmksplash/pics/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/pics/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/pics/themes/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/pics/themes/blue-bend/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/pics/themes/default/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/pics/themes/default/locolor/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/pics/themes/none/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/pics/themes/simple/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/themeengine/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/themeengine/default/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/themeengine/redmond/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/themeengine/redmond/pics/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/themeengine/simple/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/themeengine/standard/Makefile"
-+
-+ac_config_files="$ac_config_files ksplashml/themeengine/standard/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kstart/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/CContLib/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/example/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/gui/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/gui/SensorDisplayLib/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/gui/ksgrd/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/ksysguardd/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/ksysguardd/FreeBSD/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/ksysguardd/Irix/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/ksysguardd/Linux/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/ksysguardd/NetBSD/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/ksysguardd/OpenBSD/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/ksysguardd/Solaris/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/ksysguardd/Tru64/Makefile"
-+
-+ac_config_files="$ac_config_files ksysguard/pics/Makefile"
-+
-+ac_config_files="$ac_config_files ksystraycmd/Makefile"
-+
-+ac_config_files="$ac_config_files ktip/Makefile"
-+
-+ac_config_files="$ac_config_files ktip/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/b2/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/b2/config/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/default/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/default/config/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/keramik/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/keramik/config/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/kwmtheme/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/kwmtheme/cli_installer/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/laptop/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/modernsystem/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/modernsystem/config/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/plastik/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/plastik/config/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/quartz/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/quartz/config/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/redmond/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/test/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/clients/web/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/data/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/kcmkwin/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/kcmkwin/kwindecoration/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/kcmkwin/kwinoptions/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/kcmkwin/kwinrules/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/killer/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/kompmgr/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/lib/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/oldheaders/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/pics/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/tools/Makefile"
-+
-+ac_config_files="$ac_config_files kwin/tools/decobenchmark/Makefile"
-+
-+ac_config_files="$ac_config_files kxkb/Makefile"
-+
-+ac_config_files="$ac_config_files kxkb/pics/Makefile"
-+
-+ac_config_files="$ac_config_files l10n/Makefile"
-+
-+ac_config_files="$ac_config_files libkonq/Makefile"
-+
-+ac_config_files="$ac_config_files libkonq/favicons/Makefile"
-+
-+ac_config_files="$ac_config_files libkonq/pics/Makefile"
-+
-+ac_config_files="$ac_config_files libkonq/tests/Makefile"
-+
-+ac_config_files="$ac_config_files nsplugins/Makefile"
-+
-+ac_config_files="$ac_config_files nsplugins/test/Makefile"
-+
-+ac_config_files="$ac_config_files nsplugins/viewer/Makefile"
-+
-+ac_config_files="$ac_config_files nsplugins/wrapper/Makefile"
-+
-+ac_config_files="$ac_config_files pics/Makefile"
-+
-+ac_config_files="$ac_config_files pics/crystalsvg/Makefile"
-+
-+ac_config_files="$ac_config_files pics/wallpapers/Makefile"
-+
-+ac_config_files="$ac_config_files kdm/kfrontend/sessions/kde.desktop"
-+
-+ac_config_files="$ac_config_files khelpcenter/searchhandlers/khc_docbookdig.pl"
-+
-+ac_config_files="$ac_config_files khelpcenter/searchhandlers/khc_htdig.pl"
-+
-+cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
+   vari=`echo $i | sed -e 's,[-+.@],_,g'`
+   if test $install_it = "yes"; then
+     TOPSUBDIRS="$TOPSUBDIRS $i"
+@@ -57118,39 +56572,58 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
 +# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
 +(
 +  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
 +    eval ac_val=\$$ac_var
@@ -72813,28 +55740,41 @@
 +    esac
 +  done
 +
-+  (set) 2>&1 |
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
 +    case $as_nl`(ac_space=' '; set) 2>&1` in #(
 +    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes (double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+       # `set' does not quote correctly, so add quotes (double-quote
+       # substitution turns \\\\ into \\, and sed turns \\ into \).
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
 +      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
 +      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
+       ;;
+-    esac;
+-} |
 +    esac |
 +    sort
 +) |
-+  sed '
+   sed '
 +     /^ac_cv_env_/b end
-+     t clear
+      t clear
+-     : clear
 +     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
@@ -72842,36 +55782,56 @@
 +    test "x$cache_file" != "x/dev/null" &&
 +      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
 +echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
+     cat confcache >$cache_file
+   else
+-    echo "not updating unwritable cache $cache_file"
 +    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
 +echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+  fi
-+fi
-+rm -f confcache
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-+  # 1. Remove the extension, and $U if already installed.
+   fi
+ fi
+ rm -f confcache
+@@ -57159,38 +56632,31 @@
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
+-if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+-s/:*\$(srcdir):*/:/;
+-s/:*\${srcdir}:*/:/;
+-s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[	 ]*\):*/\1/;
+-s/:*$//;
+-s/^[^=]*=[	 ]*$//;
+-}'
+-fi
+-
+ DEFS=-DHAVE_CONFIG_H
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+-  ac_i=`echo "$ac_i" |
+-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+-  # 2. Add them.
+-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
 +  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
 +  ac_i=`echo "$ac_i" | sed "$ac_script"`
 +  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
 +  #    will be set to the directory where LIBOBJS objects are built.
 +  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
 +  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-+done
-+LIBOBJS=$ac_libobjs
-+
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
+ done
+ LIBOBJS=$ac_libobjs
+ 
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
 +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
 +  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 +Usually this means the macro was only invoked conditionally." >&5
@@ -72879,591 +55839,24 @@
 +Usually this means the macro was only invoked conditionally." >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
-+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
-+echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${unsermake_enable_pch_TRUE}" && test -z "${unsermake_enable_pch_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"unsermake_enable_pch\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"unsermake_enable_pch\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_x11_TRUE}" && test -z "${include_x11_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_x11\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_x11\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_ARTS_TRUE}" && test -z "${include_ARTS_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_ARTS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${have_xcursor_TRUE}" && test -z "${have_xcursor_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"have_xcursor\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"have_xcursor\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_kcontrol_access_TRUE}" && test -z "${include_kcontrol_access_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_kcontrol_access\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_kcontrol_access\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_kcontrol_accessibility_TRUE}" && test -z "${include_kcontrol_accessibility_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_kcontrol_accessibility\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_kcontrol_accessibility\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${COMPILE_GL_INFO_TRUE}" && test -z "${COMPILE_GL_INFO_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"COMPILE_GL_INFO\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"COMPILE_GL_INFO\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_kcontrol_joystick_TRUE}" && test -z "${include_kcontrol_joystick_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_kcontrol_joystick\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_kcontrol_joystick\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_fontinst_tn_TRUE}" && test -z "${include_fontinst_tn_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_fontinst_tn\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_fontinst_tn\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_kcontrol_kfontinst_TRUE}" && test -z "${include_kcontrol_kfontinst_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_kcontrol_kfontinst\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_kcontrol_kfontinst\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_kcontrol_randr_TRUE}" && test -z "${include_kcontrol_randr_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_kcontrol_randr\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_kcontrol_randr\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_kcontrol_smartcard_TRUE}" && test -z "${include_kcontrol_smartcard_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_kcontrol_smartcard\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_kcontrol_smartcard\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_kcontrol_usbview_TRUE}" && test -z "${include_kcontrol_usbview_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_kcontrol_usbview\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_kcontrol_usbview\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${install_usbids_TRUE}" && test -z "${install_usbids_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"install_usbids\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"install_usbids\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_kcontrol_view1394_TRUE}" && test -z "${include_kcontrol_view1394_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_kcontrol_view1394\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_kcontrol_view1394\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_BZIP2_TRUE}" && test -z "${include_BZIP2_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_BZIP2\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_BZIP2\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_kioslave_ldap_TRUE}" && test -z "${include_kioslave_ldap_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_kioslave_ldap\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_kioslave_ldap\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_media_linuxcdpolling_TRUE}" && test -z "${include_media_linuxcdpolling_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_media_linuxcdpolling\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_media_linuxcdpolling\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_media_halbackend_TRUE}" && test -z "${include_media_halbackend_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_media_halbackend\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_media_halbackend\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_kioslave_smb_TRUE}" && test -z "${include_kioslave_smb_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_kioslave_smb\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_kioslave_smb\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_EXR_MODULES_TRUE}" && test -z "${include_EXR_MODULES_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_EXR_MODULES\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_EXR_MODULES\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_ksysguardd_TRUE}" && test -z "${include_ksysguardd_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_ksysguardd\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_ksysguardd\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_ksysguardd_linux_TRUE}" && test -z "${include_ksysguardd_linux_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_ksysguardd_linux\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_ksysguardd_linux\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_ksysguardd_freebsd_TRUE}" && test -z "${include_ksysguardd_freebsd_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_ksysguardd_freebsd\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_ksysguardd_freebsd\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_ksysguardd_netbsd_TRUE}" && test -z "${include_ksysguardd_netbsd_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_ksysguardd_netbsd\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_ksysguardd_netbsd\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_ksysguardd_solaris_TRUE}" && test -z "${include_ksysguardd_solaris_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_ksysguardd_solaris\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_ksysguardd_solaris\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_ksysguardd_tru64_TRUE}" && test -z "${include_ksysguardd_tru64_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_ksysguardd_tru64\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_ksysguardd_tru64\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_ksysguardd_irix_TRUE}" && test -z "${include_ksysguardd_irix_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_ksysguardd_irix\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_ksysguardd_irix\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_ksysguardd_openbsd_TRUE}" && test -z "${include_ksysguardd_openbsd_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_ksysguardd_openbsd\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_ksysguardd_openbsd\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${supports_i8k_TRUE}" && test -z "${supports_i8k_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"supports_i8k\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"supports_i8k\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${HAVE_DNSSD_TRUE}" && test -z "${HAVE_DNSSD_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_DNSSD\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"HAVE_DNSSD\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_kompmgr_TRUE}" && test -z "${include_kompmgr_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"include_kompmgr\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_kompmgr\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${libkonq_SUBDIR_included_TRUE}" && test -z "${libkonq_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"libkonq_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"libkonq_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${applnk_SUBDIR_included_TRUE}" && test -z "${applnk_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"applnk_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"applnk_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${doc_SUBDIR_included_TRUE}" && test -z "${doc_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"doc_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"doc_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${drkonqi_SUBDIR_included_TRUE}" && test -z "${drkonqi_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"drkonqi_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"drkonqi_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kappfinder_SUBDIR_included_TRUE}" && test -z "${kappfinder_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kappfinder_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kappfinder_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kate_SUBDIR_included_TRUE}" && test -z "${kate_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kate_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kate_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kcheckpass_SUBDIR_included_TRUE}" && test -z "${kcheckpass_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kcheckpass_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kcheckpass_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kcminit_SUBDIR_included_TRUE}" && test -z "${kcminit_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kcminit_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kcminit_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kdcop_SUBDIR_included_TRUE}" && test -z "${kdcop_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kdcop_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kdcop_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kdebugdialog_SUBDIR_included_TRUE}" && test -z "${kdebugdialog_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kdebugdialog_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kdebugdialog_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kdeeject_SUBDIR_included_TRUE}" && test -z "${kdeeject_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kdeeject_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kdeeject_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kdepasswd_SUBDIR_included_TRUE}" && test -z "${kdepasswd_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kdepasswd_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kdepasswd_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kdeprint_SUBDIR_included_TRUE}" && test -z "${kdeprint_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kdeprint_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kdeprint_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kdesu_SUBDIR_included_TRUE}" && test -z "${kdesu_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kdesu_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kdesu_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kdialog_SUBDIR_included_TRUE}" && test -z "${kdialog_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kdialog_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kdialog_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kdmlib_SUBDIR_included_TRUE}" && test -z "${kdmlib_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kdmlib_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kdmlib_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kfind_SUBDIR_included_TRUE}" && test -z "${kfind_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kfind_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kfind_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${khelpcenter_SUBDIR_included_TRUE}" && test -z "${khelpcenter_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"khelpcenter_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"khelpcenter_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${khotkeys_SUBDIR_included_TRUE}" && test -z "${khotkeys_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"khotkeys_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"khotkeys_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kioslave_SUBDIR_included_TRUE}" && test -z "${kioslave_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kioslave_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kioslave_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${klipper_SUBDIR_included_TRUE}" && test -z "${klipper_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"klipper_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"klipper_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kmenuedit_SUBDIR_included_TRUE}" && test -z "${kmenuedit_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kmenuedit_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kmenuedit_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${knetattach_SUBDIR_included_TRUE}" && test -z "${knetattach_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"knetattach_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"knetattach_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${konsole_SUBDIR_included_TRUE}" && test -z "${konsole_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"konsole_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"konsole_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kpager_SUBDIR_included_TRUE}" && test -z "${kpager_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kpager_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kpager_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kpersonalizer_SUBDIR_included_TRUE}" && test -z "${kpersonalizer_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kpersonalizer_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kpersonalizer_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kreadconfig_SUBDIR_included_TRUE}" && test -z "${kreadconfig_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kreadconfig_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kreadconfig_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kscreensaver_SUBDIR_included_TRUE}" && test -z "${kscreensaver_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kscreensaver_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kscreensaver_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${ksplashml_SUBDIR_included_TRUE}" && test -z "${ksplashml_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"ksplashml_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"ksplashml_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kstart_SUBDIR_included_TRUE}" && test -z "${kstart_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kstart_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kstart_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${ksysguard_SUBDIR_included_TRUE}" && test -z "${ksysguard_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"ksysguard_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"ksysguard_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${ksystraycmd_SUBDIR_included_TRUE}" && test -z "${ksystraycmd_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"ksystraycmd_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"ksystraycmd_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${ktip_SUBDIR_included_TRUE}" && test -z "${ktip_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"ktip_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"ktip_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kwin_SUBDIR_included_TRUE}" && test -z "${kwin_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kwin_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kwin_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kxkb_SUBDIR_included_TRUE}" && test -z "${kxkb_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kxkb_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kxkb_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${l10n_SUBDIR_included_TRUE}" && test -z "${l10n_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"l10n_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"l10n_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${nsplugins_SUBDIR_included_TRUE}" && test -z "${nsplugins_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"nsplugins_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"nsplugins_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${pics_SUBDIR_included_TRUE}" && test -z "${pics_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"pics_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"pics_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${konqueror_SUBDIR_included_TRUE}" && test -z "${konqueror_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"konqueror_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"konqueror_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${ksmserver_SUBDIR_included_TRUE}" && test -z "${ksmserver_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"ksmserver_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"ksmserver_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kicker_SUBDIR_included_TRUE}" && test -z "${kicker_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kicker_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kicker_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kcontrol_SUBDIR_included_TRUE}" && test -z "${kcontrol_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kcontrol_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kcontrol_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kdesktop_SUBDIR_included_TRUE}" && test -z "${kdesktop_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kdesktop_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kdesktop_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${kdm_SUBDIR_included_TRUE}" && test -z "${kdm_SUBDIR_included_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"kdm_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"kdm_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+: ${CONFIG_STATUS=./config.status}
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate the current configuration.
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in config.log if it exists.
-+
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
-+
+ 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
+@@ -57768,17 +57234,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+"$@"}'='"$@"'
+ 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+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
 +  setopt NO_GLOB_SUBST
 +else
 +  case `(set -o) 2>/dev/null` in
@@ -73494,16 +55887,15 @@
 +    PATH_SEPARATOR=:
 +  fi
 +  rm -f conf$$.sh
-+fi
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+fi
-+
-+
+ fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+ 
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+@@ -57788,8 +57282,43 @@
+ fi
+ 
+ 
 +# IFS
 +# We need space, tab and new line, in precisely that order.  Quoting is
 +# there to prevent editors from complaining about space-tab.
@@ -73537,48 +55929,62 @@
 +  { (exit 1); exit 1; }
 +fi
 +
-+# Work around bugs in pre-3.0 UWIN ksh.
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
 +for as_var in ENV MAIL MAILPATH
 +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 +done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -57803,18 +57332,19 @@
+   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+-    $as_unset $as_var
 +    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+  fi
-+done
-+
-+# Required to use basename.
+   fi
+ done
+ 
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+
-+# Name of the executable.
+   as_basename=basename
+ else
+   as_basename=false
+@@ -57822,159 +57352,120 @@
+ 
+ 
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
 +as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
 +	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X/"$0" |
+ echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^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
@@ -73592,55 +55998,140 @@
 +	    q
 +	  }
 +	  s/.*/./; q'`
-+
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
+-fi
 +# CDPATH.
 +$as_unset CDPATH
-+
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+ 
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
+-	 /*)
+-	   if ("$as_dir/$as_base" -c '
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
 +  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+
-+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+  # uniformly replaced by the line number.  The first 'sed' inserts a
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
 +  # line-number line after each line using $LINENO; the second 'sed'
 +  # does the real work.  The second script uses 'N' to pair each
 +  # line-number line with the line containing $LINENO, and appends
 +  # trailing '-' during substitution so that $LINENO is not a special
 +  # case at line end.
-+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
 +  # scripts with optimization help from Paolo Bonzini.  Blame Lee
 +  # E. McMahon (1931-1989) for sed's syntax.  :-)
 +  sed -n '
 +    p
 +    /[$]LINENO/=
 +  ' <$as_myself |
-+    sed '
+     sed '
 +      s/[$]LINENO.*/&-/
 +      t lineno
 +      b
 +      :lineno
-+      N
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
 +      :loop
 +      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-+      t loop
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
 +      s/-\n.*//
-+    ' >$as_me.lineno &&
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
 +  chmod +x "$as_me.lineno" ||
 +    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+   { (exit 1); exit 1; }; }
-+
-+  # Don't try to exec as it changes $[0], causing all sort of problems
-+  # (the dirname of $[0] is not the place where we might find the
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
 +  # original and so on.  Autoconf is especially sensitive to this).
 +  . "./$as_me.lineno"
-+  # Exit status is that of the last command.
-+  exit
-+}
-+
-+
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 +  as_dirname=dirname
 +else
@@ -73656,46 +56147,55 @@
 +  esac;;
 +*)
 +  ECHO_N='-n';;
-+esac
-+
+ esac
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
 +if test -d conf$$.dir; then
 +  rm -f conf$$.dir/conf$$.file
 +else
 +  rm -f conf$$.dir
 +  mkdir conf$$.dir
 +fi
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
 +  as_ln_s='ln -s'
 +  # ... but there are two gotchas:
 +  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 +  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
 +  # In both cases, we have to default to `cp -p'.
 +  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+    as_ln_s='cp -p'
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s=ln
-+else
-+  as_ln_s='cp -p'
-+fi
+     as_ln_s='cp -p'
+-  else
+-    as_ln_s='ln -s'
+-  fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 +rmdir conf$$.dir 2>/dev/null
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p=:
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+@@ -57983,7 +57474,28 @@
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
 +if test -x / >/dev/null 2>&1; then
 +  as_test_x='test -x'
 +else
@@ -73718,121 +56218,171 @@
 +  '
 +fi
 +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'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+exec 6>&1
-+
+ 
+ # 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'"
+@@ -57992,31 +57504,14 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+ exec 6>&1
+ 
+-# Open the log real soon, to keep \$[0] and so on meaningful, and to
 +# Save the log message, to keep $[0] and so on meaningful, and to
-+# report actual input values of CONFIG_FILES etc. instead of their
+ # report actual input values of CONFIG_FILES etc. instead of their
+-# values after options handling.  Logging --version etc. is OK.
+-exec 5>>config.log
+-{
+-  echo
+-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running $as_me. ##
+-_ASBOX
+-} >&5
+-cat >&5 <<_CSEOF
+-
 +# values after options handling.
 +ac_log="
-+This file was extended by $as_me, which was
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
 +generated by GNU Autoconf 2.61.  Invocation command line was
-+
-+  CONFIG_FILES    = $CONFIG_FILES
-+  CONFIG_HEADERS  = $CONFIG_HEADERS
-+  CONFIG_LINKS    = $CONFIG_LINKS
-+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-+  $ $0 $@
-+
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -58024,30 +57519,20 @@
+   CONFIG_COMMANDS = $CONFIG_COMMANDS
+   $ $0 $@
+ 
+-_CSEOF
+-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+-echo >&5
 +on `(hostname || uname -n) 2>/dev/null | sed 1q`
 +"
 +
-+_ACEOF
-+
+ _ACEOF
+ 
 +cat >>$CONFIG_STATUS <<_ACEOF
-+# Files that config.status was made for.
+ # Files that config.status was made for.
+-if test -n "$ac_config_files"; then
+-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_headers"; then
+-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_links"; then
+-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
 +config_files="$ac_config_files"
 +config_headers="$ac_config_headers"
 +config_commands="$ac_config_commands"
-+
+ 
+-if test -n "$ac_config_commands"; then
+-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-fi
 +_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+ac_cs_usage="\
-+\`$as_me' instantiates files from templates according to the
-+current configuration.
-+
-+Usage: $0 [OPTIONS] [FILE]...
-+
-+  -h, --help       print this help, then exit
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+@@ -58055,7 +57540,7 @@
+ Usage: $0 [OPTIONS] [FILE]...
+ 
+   -h, --help       print this help, then exit
+-  -V, --version    print version number, then exit
 +  -V, --version    print version number and configuration settings, then exit
-+  -q, --quiet      do not print progress messages
-+  -d, --debug      don't remove temporary files
-+      --recheck    update $as_me by reconfiguring in the same conditions
-+  --file=FILE[:TEMPLATE]
-+		   instantiate the configuration file FILE
-+  --header=FILE[:TEMPLATE]
-+		   instantiate the configuration header FILE
-+
-+Configuration files:
-+$config_files
-+
-+Configuration headers:
-+$config_headers
-+
-+Configuration commands:
-+$config_commands
-+
-+Report bugs to <bug-autoconf at gnu.org>."
-+
+   -q, --quiet      do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+@@ -58074,19 +57559,21 @@
+ $config_commands
+ 
+ Report bugs to <bug-autoconf at gnu.org>."
+-_ACEOF
+ 
 +_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ac_cs_version="\\
-+config.status
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ 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.61,
 +  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+
+ 
+-Copyright (C) 2003 Free Software Foundation, Inc.
 +Copyright (C) 2006 Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+-srcdir=$srcdir
+-INSTALL="$INSTALL"
 +
 +ac_pwd='$ac_pwd'
 +srcdir='$srcdir'
 +INSTALL='$INSTALL'
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If no file are specified by the user, then we need to provide default
-+# value.  By we need to know if files were specified by the user.
-+ac_need_defaults=:
-+while test $# != 0
-+do
-+  case $1 in
-+  --*=*)
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -58097,39 +57584,24 @@
+ do
+   case $1 in
+   --*=*)
+-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
 +    ac_option=`expr "X$1" : 'X\([^=]*\)='`
 +    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-+    ac_shift=:
-+    ;;
+     ac_shift=:
+     ;;
+-  -*)
 +  *)
-+    ac_option=$1
-+    ac_optarg=$2
-+    ac_shift=shift
-+    ;;
-+  esac
-+
-+  case $ac_option in
-+  # Handling of the options.
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    ac_cs_recheck=: ;;
+     ac_option=$1
+     ac_optarg=$2
+     ac_shift=shift
+     ;;
+-  *) # This is not an option, so the user has probably given explicit
+-     # arguments.
+-     ac_option=$1
+-     ac_need_defaults=false;;
+   esac
+ 
+   case $ac_option in
+   # Handling of the options.
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+     ac_cs_recheck=: ;;
+-  --version | --vers* | -V )
+-    echo "$ac_cs_version"; exit 0 ;;
+-  --he | --h)
+-    # Conflict between --help and --header
+-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2;}
+-   { (exit 1); exit 1; }; };;
+-  --help | --hel | -h )
+-    echo "$ac_cs_usage"; exit 0 ;;
+-  --debug | --d* | -d )
 +  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
 +    echo "$ac_cs_version"; exit ;;
 +  --debug | --debu | --deb | --de | --d | -d )
-+    debug=: ;;
-+  --file | --fil | --fi | --f )
-+    $ac_shift
-+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+    ac_need_defaults=false;;
-+  --header | --heade | --head | --hea )
-+    $ac_shift
-+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-+    ac_need_defaults=false;;
+     debug=: ;;
+   --file | --fil | --fi | --f )
+     $ac_shift
+@@ -58139,18 +57611,24 @@
+     $ac_shift
+     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     ac_need_defaults=false;;
 +  --he | --h)
 +    # Conflict between --help and --header
 +    { echo "$as_me: error: ambiguous option: $1
@@ -73840,39 +56390,38 @@
 +   { (exit 1); exit 1; }; };;
 +  --help | --hel | -h )
 +    echo "$ac_cs_usage"; exit ;;
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+    ac_cs_silent=: ;;
-+
-+  # This is an error.
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil | --si | --s)
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2;}
 +  -*) { echo "$as_me: error: unrecognized option: $1
 +Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; } ;;
-+
+    { (exit 1); exit 1; }; } ;;
+ 
+-  *) ac_config_targets="$ac_config_targets $1" ;;
 +  *) ac_config_targets="$ac_config_targets $1"
 +     ac_need_defaults=false ;;
-+
-+  esac
-+  shift
-+done
-+
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+if \$ac_cs_recheck; then
+ 
+   esac
+   shift
+@@ -58166,530 +57644,542 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 +  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
 +  CONFIG_SHELL=$SHELL
 +  export CONFIG_SHELL
 +  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
-+
-+_ACEOF
+ fi
+ 
+ _ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF
 +exec 5>>config.log
 +{
@@ -73882,21 +56431,523 @@
 +_ASBOX
 +  echo "$ac_log"
 +} >&5
-+
+ 
 +_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+#
+ cat >>$CONFIG_STATUS <<_ACEOF
+ #
+-# INIT-COMMANDS section.
 +# INIT-COMMANDS
-+#
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ #
+-
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ 
+ _ACEOF
+ 
+-
+-
+ cat >>$CONFIG_STATUS <<\_ACEOF
 +
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
 +# Handling of arguments.
-+for ac_config_target in $ac_config_targets
-+do
+ for ac_config_target in $ac_config_targets
+ do
+-  case "$ac_config_target" in
+-  # Handling of arguments.
+-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+-  "applnk/Makefile" ) CONFIG_FILES="$CONFIG_FILES applnk/Makefile" ;;
+-  "applnk/compat/Makefile" ) CONFIG_FILES="$CONFIG_FILES applnk/compat/Makefile" ;;
+-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+-  "doc/faq/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/faq/Makefile" ;;
+-  "doc/glossary/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/glossary/Makefile" ;;
+-  "doc/kappfinder/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kappfinder/Makefile" ;;
+-  "doc/kate/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kate/Makefile" ;;
+-  "doc/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/Makefile" ;;
+-  "doc/kcontrol/arts/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/arts/Makefile" ;;
+-  "doc/kcontrol/background/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/background/Makefile" ;;
+-  "doc/kcontrol/bell/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/bell/Makefile" ;;
+-  "doc/kcontrol/cache/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/cache/Makefile" ;;
+-  "doc/kcontrol/clock/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/clock/Makefile" ;;
+-  "doc/kcontrol/colors/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/colors/Makefile" ;;
+-  "doc/kcontrol/cookies/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/cookies/Makefile" ;;
+-  "doc/kcontrol/crypto/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/crypto/Makefile" ;;
+-  "doc/kcontrol/desktop/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/desktop/Makefile" ;;
+-  "doc/kcontrol/desktopbehavior/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/desktopbehavior/Makefile" ;;
+-  "doc/kcontrol/ebrowsing/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/ebrowsing/Makefile" ;;
+-  "doc/kcontrol/email/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/email/Makefile" ;;
+-  "doc/kcontrol/energy/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/energy/Makefile" ;;
+-  "doc/kcontrol/filemanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/filemanager/Makefile" ;;
+-  "doc/kcontrol/filetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/filetypes/Makefile" ;;
+-  "doc/kcontrol/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/fonts/Makefile" ;;
+-  "doc/kcontrol/helpindex/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/helpindex/Makefile" ;;
+-  "doc/kcontrol/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/icons/Makefile" ;;
+-  "doc/kcontrol/kcmaccess/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmaccess/Makefile" ;;
+-  "doc/kcontrol/kcmcss/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmcss/Makefile" ;;
+-  "doc/kcontrol/kcmfontinst/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmfontinst/Makefile" ;;
+-  "doc/kcontrol/kcmkonsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmkonsole/Makefile" ;;
+-  "doc/kcontrol/kcmlaunch/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmlaunch/Makefile" ;;
+-  "doc/kcontrol/kcmnotify/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmnotify/Makefile" ;;
+-  "doc/kcontrol/kcmsmserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmsmserver/Makefile" ;;
+-  "doc/kcontrol/kcmstyle/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmstyle/Makefile" ;;
+-  "doc/kcontrol/kcmtaskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmtaskbar/Makefile" ;;
+-  "doc/kcontrol/kdm/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kdm/Makefile" ;;
+-  "doc/kcontrol/keyboard/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/keyboard/Makefile" ;;
+-  "doc/kcontrol/keys/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/keys/Makefile" ;;
+-  "doc/kcontrol/khtml/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/khtml/Makefile" ;;
+-  "doc/kcontrol/kwindecoration/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kwindecoration/Makefile" ;;
+-  "doc/kcontrol/language/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/language/Makefile" ;;
+-  "doc/kcontrol/mouse/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/mouse/Makefile" ;;
+-  "doc/kcontrol/netpref/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/netpref/Makefile" ;;
+-  "doc/kcontrol/panel/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/panel/Makefile" ;;
+-  "doc/kcontrol/panelappearance/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/panelappearance/Makefile" ;;
+-  "doc/kcontrol/passwords/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/passwords/Makefile" ;;
+-  "doc/kcontrol/performance/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/performance/Makefile" ;;
+-  "doc/kcontrol/proxy/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/proxy/Makefile" ;;
+-  "doc/kcontrol/screensaver/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/screensaver/Makefile" ;;
+-  "doc/kcontrol/smb/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/smb/Makefile" ;;
+-  "doc/kcontrol/spellchecking/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/spellchecking/Makefile" ;;
+-  "doc/kcontrol/useragent/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/useragent/Makefile" ;;
+-  "doc/kcontrol/windowmanagement/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/windowmanagement/Makefile" ;;
+-  "doc/kdcop/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdcop/Makefile" ;;
+-  "doc/kdebugdialog/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdebugdialog/Makefile" ;;
+-  "doc/kdeprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdeprint/Makefile" ;;
+-  "doc/kdesu/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdesu/Makefile" ;;
+-  "doc/kdm/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdm/Makefile" ;;
+-  "doc/kfind/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kfind/Makefile" ;;
+-  "doc/khelpcenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/khelpcenter/Makefile" ;;
+-  "doc/kicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kicker/Makefile" ;;
+-  "doc/kinfocenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/Makefile" ;;
+-  "doc/kinfocenter/cdinfo/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/cdinfo/Makefile" ;;
+-  "doc/kinfocenter/devices/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/devices/Makefile" ;;
+-  "doc/kinfocenter/dma/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/dma/Makefile" ;;
+-  "doc/kinfocenter/interrupts/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/interrupts/Makefile" ;;
+-  "doc/kinfocenter/ioports/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/ioports/Makefile" ;;
+-  "doc/kinfocenter/memory/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/memory/Makefile" ;;
+-  "doc/kinfocenter/nics/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/nics/Makefile" ;;
+-  "doc/kinfocenter/opengl/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/opengl/Makefile" ;;
+-  "doc/kinfocenter/partitions/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/partitions/Makefile" ;;
+-  "doc/kinfocenter/pci/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/pci/Makefile" ;;
+-  "doc/kinfocenter/pcmcia/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/pcmcia/Makefile" ;;
+-  "doc/kinfocenter/processor/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/processor/Makefile" ;;
+-  "doc/kinfocenter/protocols/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/protocols/Makefile" ;;
+-  "doc/kinfocenter/samba/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/samba/Makefile" ;;
+-  "doc/kinfocenter/scsi/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/scsi/Makefile" ;;
+-  "doc/kinfocenter/sound/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/sound/Makefile" ;;
+-  "doc/kinfocenter/usb/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/usb/Makefile" ;;
+-  "doc/kinfocenter/xserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/xserver/Makefile" ;;
+-  "doc/kioslave/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kioslave/Makefile" ;;
+-  "doc/klipper/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/klipper/Makefile" ;;
+-  "doc/kmenuedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kmenuedit/Makefile" ;;
+-  "doc/knetattach/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/knetattach/Makefile" ;;
+-  "doc/kompmgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kompmgr/Makefile" ;;
+-  "doc/konqueror/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/konqueror/Makefile" ;;
+-  "doc/konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/konsole/Makefile" ;;
+-  "doc/kpager/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kpager/Makefile" ;;
+-  "doc/ksplashml/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ksplashml/Makefile" ;;
+-  "doc/ksysguard/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ksysguard/Makefile" ;;
+-  "doc/kwrite/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kwrite/Makefile" ;;
+-  "doc/kxkb/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kxkb/Makefile" ;;
+-  "doc/quickstart/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/quickstart/Makefile" ;;
+-  "doc/userguide/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/userguide/Makefile" ;;
+-  "doc/visualdict/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/visualdict/Makefile" ;;
+-  "drkonqi/Makefile" ) CONFIG_FILES="$CONFIG_FILES drkonqi/Makefile" ;;
+-  "drkonqi/debuggers/Makefile" ) CONFIG_FILES="$CONFIG_FILES drkonqi/debuggers/Makefile" ;;
+-  "drkonqi/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES drkonqi/pics/Makefile" ;;
+-  "drkonqi/presets/Makefile" ) CONFIG_FILES="$CONFIG_FILES drkonqi/presets/Makefile" ;;
+-  "kappfinder/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/Makefile" ;;
+-  "kappfinder/apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Makefile" ;;
+-  "kappfinder/apps/Development/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Development/Makefile" ;;
+-  "kappfinder/apps/Games/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Makefile" ;;
+-  "kappfinder/apps/Games/Arcade/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Arcade/Makefile" ;;
+-  "kappfinder/apps/Games/Board/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Board/Makefile" ;;
+-  "kappfinder/apps/Games/Card/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Card/Makefile" ;;
+-  "kappfinder/apps/Games/Emulators/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Emulators/Makefile" ;;
+-  "kappfinder/apps/Games/Roguelikes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Roguelikes/Makefile" ;;
+-  "kappfinder/apps/Games/TacticStrategy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/TacticStrategy/Makefile" ;;
+-  "kappfinder/apps/Games/Toys/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Toys/Makefile" ;;
+-  "kappfinder/apps/Graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Graphics/Makefile" ;;
+-  "kappfinder/apps/Internet/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Internet/Makefile" ;;
+-  "kappfinder/apps/Internet/Terminal/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Internet/Terminal/Makefile" ;;
+-  "kappfinder/apps/Multimedia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Multimedia/Makefile" ;;
+-  "kappfinder/apps/Office/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Office/Makefile" ;;
+-  "kappfinder/apps/System/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/System/Makefile" ;;
+-  "kappfinder/apps/System/Terminal/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/System/Terminal/Makefile" ;;
+-  "kappfinder/apps/Utilities/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/Makefile" ;;
+-  "kappfinder/apps/Utilities/Editors/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/Editors/Makefile" ;;
+-  "kappfinder/apps/Utilities/xutils/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/xutils/Makefile" ;;
+-  "kate/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/Makefile" ;;
+-  "kate/app/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/app/Makefile" ;;
+-  "kate/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/data/Makefile" ;;
+-  "kate/interfaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/interfaces/Makefile" ;;
+-  "kate/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/pics/Makefile" ;;
+-  "kate/pics/actions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/pics/actions/Makefile" ;;
+-  "kate/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/utils/Makefile" ;;
+-  "kcheckpass/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcheckpass/Makefile" ;;
+-  "kcminit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcminit/Makefile" ;;
+-  "kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/Makefile" ;;
+-  "kcontrol/access/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/access/Makefile" ;;
+-  "kcontrol/accessibility/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/accessibility/Makefile" ;;
+-  "kcontrol/arts/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/arts/Makefile" ;;
+-  "kcontrol/background/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/background/Makefile" ;;
+-  "kcontrol/background/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/background/pics/Makefile" ;;
+-  "kcontrol/bell/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/bell/Makefile" ;;
+-  "kcontrol/clock/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/clock/Makefile" ;;
+-  "kcontrol/colors/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/colors/Makefile" ;;
+-  "kcontrol/componentchooser/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/componentchooser/Makefile" ;;
+-  "kcontrol/componentchooser/componentservices/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/componentchooser/componentservices/Makefile" ;;
+-  "kcontrol/crypto/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/crypto/Makefile" ;;
+-  "kcontrol/css/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/css/Makefile" ;;
+-  "kcontrol/display/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/display/Makefile" ;;
+-  "kcontrol/dnssd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/dnssd/Makefile" ;;
+-  "kcontrol/ebrowsing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/Makefile" ;;
+-  "kcontrol/ebrowsing/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/Makefile" ;;
+-  "kcontrol/ebrowsing/plugins/ikws/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/ikws/Makefile" ;;
+-  "kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile" ;;
+-  "kcontrol/ebrowsing/plugins/localdomain/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/localdomain/Makefile" ;;
+-  "kcontrol/ebrowsing/plugins/shorturi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/shorturi/Makefile" ;;
+-  "kcontrol/energy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/energy/Makefile" ;;
+-  "kcontrol/energy/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/energy/pics/Makefile" ;;
+-  "kcontrol/filetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/filetypes/Makefile" ;;
+-  "kcontrol/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/fonts/Makefile" ;;
+-  "kcontrol/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/icons/Makefile" ;;
+-  "kcontrol/info/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/info/Makefile" ;;
+-  "kcontrol/input/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/input/Makefile" ;;
+-  "kcontrol/input/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/input/core/Makefile" ;;
+-  "kcontrol/input/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/input/pics/Makefile" ;;
+-  "kcontrol/input/xcursor/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/input/xcursor/Makefile" ;;
+-  "kcontrol/ioslaveinfo/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ioslaveinfo/Makefile" ;;
+-  "kcontrol/joystick/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/joystick/Makefile" ;;
+-  "kcontrol/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kcontrol/Makefile" ;;
+-  "kcontrol/kcontrol/about/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kcontrol/about/Makefile" ;;
+-  "kcontrol/kded/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kded/Makefile" ;;
+-  "kcontrol/kdm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kdm/Makefile" ;;
+-  "kcontrol/keys/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/keys/Makefile" ;;
+-  "kcontrol/kfontinst/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/Makefile" ;;
+-  "kcontrol/kfontinst/kcmfontinst/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kcmfontinst/Makefile" ;;
+-  "kcontrol/kfontinst/kfile-plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kfile-plugin/Makefile" ;;
+-  "kcontrol/kfontinst/kfontinst/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kfontinst/Makefile" ;;
+-  "kcontrol/kfontinst/kio/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kio/Makefile" ;;
+-  "kcontrol/kfontinst/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/lib/Makefile" ;;
+-  "kcontrol/kfontinst/thumbnail/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/thumbnail/Makefile" ;;
+-  "kcontrol/kfontinst/viewpart/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/viewpart/Makefile" ;;
+-  "kcontrol/kicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kicker/Makefile" ;;
+-  "kcontrol/kio/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kio/Makefile" ;;
+-  "kcontrol/kio/uasproviders/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kio/uasproviders/Makefile" ;;
+-  "kcontrol/knotify/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/knotify/Makefile" ;;
+-  "kcontrol/knotify/sounds/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/knotify/sounds/Makefile" ;;
+-  "kcontrol/konq/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/konq/Makefile" ;;
+-  "kcontrol/konqhtml/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/konqhtml/Makefile" ;;
+-  "kcontrol/konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/konsole/Makefile" ;;
+-  "kcontrol/krdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/Makefile" ;;
+-  "kcontrol/krdb/ad/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/ad/Makefile" ;;
+-  "kcontrol/krdb/kcs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/kcs/Makefile" ;;
+-  "kcontrol/krdb/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/pics/Makefile" ;;
+-  "kcontrol/krdb/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Makefile" ;;
+-  "kcontrol/krdb/themes/HighContrastDark/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastDark/Makefile" ;;
+-  "kcontrol/krdb/themes/HighContrastDark-big/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastDark-big/Makefile" ;;
+-  "kcontrol/krdb/themes/HighContrastLight/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastLight/Makefile" ;;
+-  "kcontrol/krdb/themes/HighContrastLight-big/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastLight-big/Makefile" ;;
+-  "kcontrol/krdb/themes/KDE_Classic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/KDE_Classic/Makefile" ;;
+-  "kcontrol/krdb/themes/Keramik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Keramik/Makefile" ;;
+-  "kcontrol/krdb/themes/Plastik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Plastik/Makefile" ;;
+-  "kcontrol/krdb/themes/Platinum/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Platinum/Makefile" ;;
+-  "kcontrol/krdb/themes/Redmond/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Redmond/Makefile" ;;
+-  "kcontrol/krdb/themes/Sunshine/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Sunshine/Makefile" ;;
+-  "kcontrol/krdb/themes/YellowOnBlue/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/YellowOnBlue/Makefile" ;;
+-  "kcontrol/krdb/themes/YellowOnBlue-big/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/YellowOnBlue-big/Makefile" ;;
+-  "kcontrol/kthememanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kthememanager/Makefile" ;;
+-  "kcontrol/launch/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/launch/Makefile" ;;
+-  "kcontrol/locale/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/locale/Makefile" ;;
+-  "kcontrol/locale/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/locale/default/Makefile" ;;
+-  "kcontrol/locale/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/locale/pics/Makefile" ;;
+-  "kcontrol/nics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/nics/Makefile" ;;
+-  "kcontrol/performance/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/performance/Makefile" ;;
+-  "kcontrol/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/pics/Makefile" ;;
+-  "kcontrol/privacy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/privacy/Makefile" ;;
+-  "kcontrol/randr/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/randr/Makefile" ;;
+-  "kcontrol/samba/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/samba/Makefile" ;;
+-  "kcontrol/screensaver/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/screensaver/Makefile" ;;
+-  "kcontrol/smartcard/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/smartcard/Makefile" ;;
+-  "kcontrol/smserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/smserver/Makefile" ;;
+-  "kcontrol/spellchecking/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/spellchecking/Makefile" ;;
+-  "kcontrol/style/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/style/Makefile" ;;
+-  "kcontrol/style/keramik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/style/keramik/Makefile" ;;
+-  "kcontrol/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/taskbar/Makefile" ;;
+-  "kcontrol/usbview/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/usbview/Makefile" ;;
+-  "kcontrol/view1394/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/view1394/Makefile" ;;
+-  "kcontrol/xinerama/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/xinerama/Makefile" ;;
+-  "kdcop/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdcop/Makefile" ;;
+-  "kdebugdialog/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdebugdialog/Makefile" ;;
+-  "kdeeject/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeeject/Makefile" ;;
+-  "kdepasswd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdepasswd/Makefile" ;;
+-  "kdepasswd/kcm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdepasswd/kcm/Makefile" ;;
+-  "kdepasswd/kcm/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdepasswd/kcm/pics/Makefile" ;;
+-  "kdeprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/Makefile" ;;
+-  "kdeprint/descriptions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/descriptions/Makefile" ;;
+-  "kdeprint/kdeprint_part/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/kdeprint_part/Makefile" ;;
+-  "kdeprint/kdeprintfax/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/kdeprintfax/Makefile" ;;
+-  "kdeprint/kjobviewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/kjobviewer/Makefile" ;;
+-  "kdeprint/kprinter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/kprinter/Makefile" ;;
+-  "kdeprint/printmgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/printmgr/Makefile" ;;
+-  "kdeprint/slave/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/slave/Makefile" ;;
+-  "kdeprint/slave/mimetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/slave/mimetypes/Makefile" ;;
+-  "kdeprint/slave/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/slave/templates/Makefile" ;;
+-  "kdesktop/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/Makefile" ;;
+-  "kdesktop/init/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/init/Makefile" ;;
+-  "kdesktop/init/Templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/init/Templates/Makefile" ;;
+-  "kdesktop/kwebdesktop/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/kwebdesktop/Makefile" ;;
+-  "kdesktop/lock/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/lock/Makefile" ;;
+-  "kdesktop/patterns/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/patterns/Makefile" ;;
+-  "kdesktop/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/pics/Makefile" ;;
+-  "kdesktop/programs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/programs/Makefile" ;;
+-  "kdesu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesu/Makefile" ;;
+-  "kdesu/kdesu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesu/kdesu/Makefile" ;;
+-  "kdesu/kdesud/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesu/kdesud/Makefile" ;;
+-  "kdialog/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdialog/Makefile" ;;
+-  "kdm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/Makefile" ;;
+-  "kdm/backend/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/backend/Makefile" ;;
+-  "kdm/kfrontend/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/Makefile" ;;
+-  "kdm/kfrontend/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/pics/Makefile" ;;
+-  "kdm/kfrontend/sessions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/sessions/Makefile" ;;
+-  "kdm/kfrontend/themer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themer/Makefile" ;;
+-  "kdm/kfrontend/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themes/Makefile" ;;
+-  "kdm/kfrontend/themes/circles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themes/circles/Makefile" ;;
+-  "kdmlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdmlib/Makefile" ;;
+-  "kfind/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfind/Makefile" ;;
+-  "kfind/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfind/pics/Makefile" ;;
+-  "khelpcenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/Makefile" ;;
+-  "khelpcenter/htmlsearch/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/htmlsearch/Makefile" ;;
+-  "khelpcenter/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/pics/Makefile" ;;
+-  "khelpcenter/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Makefile" ;;
+-  "khelpcenter/plugins/Applications/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Applications/Makefile" ;;
+-  "khelpcenter/plugins/Manpages/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Manpages/Makefile" ;;
+-  "khelpcenter/plugins/Scrollkeeper/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Scrollkeeper/Makefile" ;;
+-  "khelpcenter/plugins/Tutorials/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Tutorials/Makefile" ;;
+-  "khelpcenter/searchhandlers/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/Makefile" ;;
+-  "khotkeys/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/Makefile" ;;
+-  "khotkeys/app/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/app/Makefile" ;;
+-  "khotkeys/arts/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/arts/Makefile" ;;
+-  "khotkeys/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/data/Makefile" ;;
+-  "khotkeys/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/kcontrol/Makefile" ;;
+-  "khotkeys/kcontrol/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/kcontrol/ui/Makefile" ;;
+-  "khotkeys/shared/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/shared/Makefile" ;;
+-  "khotkeys/update/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/update/Makefile" ;;
+-  "kicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/Makefile" ;;
+-  "kicker/applets/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/Makefile" ;;
+-  "kicker/applets/clock/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/clock/Makefile" ;;
+-  "kicker/applets/launcher/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/launcher/Makefile" ;;
+-  "kicker/applets/lockout/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/lockout/Makefile" ;;
+-  "kicker/applets/media/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/media/Makefile" ;;
+-  "kicker/applets/menu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/menu/Makefile" ;;
+-  "kicker/applets/minipager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/minipager/Makefile" ;;
+-  "kicker/applets/naughty/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/naughty/Makefile" ;;
+-  "kicker/applets/run/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/run/Makefile" ;;
+-  "kicker/applets/swallow/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/swallow/Makefile" ;;
+-  "kicker/applets/systemtray/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/systemtray/Makefile" ;;
+-  "kicker/applets/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/taskbar/Makefile" ;;
+-  "kicker/applets/trash/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/trash/Makefile" ;;
+-  "kicker/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/Makefile" ;;
+-  "kicker/data/app_start_anim/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/app_start_anim/Makefile" ;;
+-  "kicker/data/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/icons/Makefile" ;;
+-  "kicker/data/icons/actions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/icons/actions/Makefile" ;;
+-  "kicker/data/kmenu_side/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/kmenu_side/Makefile" ;;
+-  "kicker/data/tiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/tiles/Makefile" ;;
+-  "kicker/data/wallpaper/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/wallpaper/Makefile" ;;
+-  "kicker/extensions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/Makefile" ;;
+-  "kicker/extensions/dockbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/dockbar/Makefile" ;;
+-  "kicker/extensions/kasbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/kasbar/Makefile" ;;
+-  "kicker/extensions/sidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/sidebar/Makefile" ;;
+-  "kicker/extensions/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/taskbar/Makefile" ;;
+-  "kicker/kicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/kicker/Makefile" ;;
+-  "kicker/kicker/buttons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/kicker/buttons/Makefile" ;;
+-  "kicker/kicker/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/kicker/core/Makefile" ;;
+-  "kicker/kicker/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/kicker/ui/Makefile" ;;
+-  "kicker/libkicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/libkicker/Makefile" ;;
+-  "kicker/menuext/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/Makefile" ;;
+-  "kicker/menuext/find/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/find/Makefile" ;;
+-  "kicker/menuext/kate/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/kate/Makefile" ;;
+-  "kicker/menuext/kdeprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/kdeprint/Makefile" ;;
+-  "kicker/menuext/konq-profiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/konq-profiles/Makefile" ;;
+-  "kicker/menuext/konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/konsole/Makefile" ;;
+-  "kicker/menuext/prefmenu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/prefmenu/Makefile" ;;
+-  "kicker/menuext/recentdocs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/recentdocs/Makefile" ;;
+-  "kicker/menuext/remote/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/remote/Makefile" ;;
+-  "kicker/menuext/system/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/system/Makefile" ;;
+-  "kicker/menuext/tom/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/tom/Makefile" ;;
+-  "kicker/proxy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/proxy/Makefile" ;;
+-  "kicker/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/taskbar/Makefile" ;;
+-  "kicker/taskmanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/taskmanager/Makefile" ;;
+-  "kioslave/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/Makefile" ;;
+-  "kioslave/about/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/about/Makefile" ;;
+-  "kioslave/cgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/cgi/Makefile" ;;
+-  "kioslave/cgi/kcmcgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/cgi/kcmcgi/Makefile" ;;
+-  "kioslave/filter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/filter/Makefile" ;;
+-  "kioslave/finger/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/finger/Makefile" ;;
+-  "kioslave/fish/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/fish/Makefile" ;;
+-  "kioslave/floppy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/floppy/Makefile" ;;
+-  "kioslave/home/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/home/Makefile" ;;
+-  "kioslave/home/kdedmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/home/kdedmodule/Makefile" ;;
+-  "kioslave/info/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/info/Makefile" ;;
+-  "kioslave/ldap/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/ldap/Makefile" ;;
+-  "kioslave/mac/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/mac/Makefile" ;;
+-  "kioslave/man/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/man/Makefile" ;;
+-  "kioslave/media/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/Makefile" ;;
+-  "kioslave/media/kcmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/kcmodule/Makefile" ;;
+-  "kioslave/media/kfile-plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/kfile-plugin/Makefile" ;;
+-  "kioslave/media/libmediacommon/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/libmediacommon/Makefile" ;;
+-  "kioslave/media/mediamanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/mediamanager/Makefile" ;;
+-  "kioslave/media/medianotifier/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/medianotifier/Makefile" ;;
+-  "kioslave/media/mimetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/mimetypes/Makefile" ;;
+-  "kioslave/media/mounthelper/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/mounthelper/Makefile" ;;
+-  "kioslave/media/propsdlgplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/propsdlgplugin/Makefile" ;;
+-  "kioslave/media/services/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/services/Makefile" ;;
+-  "kioslave/nfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/nfs/Makefile" ;;
+-  "kioslave/nntp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/nntp/Makefile" ;;
+-  "kioslave/pop3/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/pop3/Makefile" ;;
+-  "kioslave/remote/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/remote/Makefile" ;;
+-  "kioslave/remote/kdedmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/remote/kdedmodule/Makefile" ;;
+-  "kioslave/settings/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/settings/Makefile" ;;
+-  "kioslave/sftp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/sftp/Makefile" ;;
+-  "kioslave/smb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/smb/Makefile" ;;
+-  "kioslave/smtp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/smtp/Makefile" ;;
+-  "kioslave/system/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/system/Makefile" ;;
+-  "kioslave/system/entries/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/system/entries/Makefile" ;;
+-  "kioslave/system/kdedmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/system/kdedmodule/Makefile" ;;
+-  "kioslave/system/mimetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/system/mimetypes/Makefile" ;;
+-  "kioslave/tar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/tar/Makefile" ;;
+-  "kioslave/thumbnail/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/thumbnail/Makefile" ;;
+-  "kioslave/trash/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/trash/Makefile" ;;
+-  "kioslave/trash/kfile-plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/trash/kfile-plugin/Makefile" ;;
+-  "klipper/Makefile" ) CONFIG_FILES="$CONFIG_FILES klipper/Makefile" ;;
+-  "kmenuedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmenuedit/Makefile" ;;
+-  "kmenuedit/pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmenuedit/pixmaps/Makefile" ;;
+-  "knetattach/Makefile" ) CONFIG_FILES="$CONFIG_FILES knetattach/Makefile" ;;
+-  "konqueror/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/Makefile" ;;
+-  "konqueror/about/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/about/Makefile" ;;
+-  "konqueror/client/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/client/Makefile" ;;
+-  "konqueror/iconview/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/iconview/Makefile" ;;
+-  "konqueror/keditbookmarks/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/keditbookmarks/Makefile" ;;
+-  "konqueror/kttsplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/kttsplugin/Makefile" ;;
+-  "konqueror/listview/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/listview/Makefile" ;;
+-  "konqueror/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/pics/Makefile" ;;
+-  "konqueror/pics/actions/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/pics/actions/Makefile" ;;
+-  "konqueror/pics/indicators/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/pics/indicators/Makefile" ;;
+-  "konqueror/pics/tiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/pics/tiles/Makefile" ;;
+-  "konqueror/preloader/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/preloader/Makefile" ;;
+-  "konqueror/quickprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/quickprint/Makefile" ;;
+-  "konqueror/remoteencodingplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/remoteencodingplugin/Makefile" ;;
+-  "konqueror/shellcmdplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/shellcmdplugin/Makefile" ;;
+-  "konqueror/sidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/Makefile" ;;
+-  "konqueror/sidebar/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/test/Makefile" ;;
+-  "konqueror/sidebar/trees/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/Makefile" ;;
+-  "konqueror/sidebar/trees/bookmark_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/bookmark_module/Makefile" ;;
+-  "konqueror/sidebar/trees/dirtree_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/dirtree_module/Makefile" ;;
+-  "konqueror/sidebar/trees/history_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/history_module/Makefile" ;;
+-  "konqueror/sidebar/trees/init/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/Makefile" ;;
+-  "konqueror/sidebar/trees/init/remote/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/Makefile" ;;
+-  "konqueror/sidebar/trees/init/remote/ftp/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/ftp/Makefile" ;;
+-  "konqueror/sidebar/trees/init/remote/web/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/web/Makefile" ;;
+-  "konqueror/sidebar/trees/init/services/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/services/Makefile" ;;
+-  "konqueror/sidebar/web_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/web_module/Makefile" ;;
+-  "konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/Makefile" ;;
+-  "konsole/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/doc/Makefile" ;;
+-  "konsole/doc/VT100/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/doc/VT100/Makefile" ;;
+-  "konsole/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/fonts/Makefile" ;;
+-  "konsole/konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/konsole/Makefile" ;;
+-  "konsole/other/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/other/Makefile" ;;
+-  "konsole/other/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/other/icons/Makefile" ;;
+-  "konsole/other/wallpapers/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/other/wallpapers/Makefile" ;;
+-  "kpager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpager/Makefile" ;;
+-  "kpersonalizer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpersonalizer/Makefile" ;;
+-  "kpersonalizer/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpersonalizer/pics/Makefile" ;;
+-  "kreadconfig/Makefile" ) CONFIG_FILES="$CONFIG_FILES kreadconfig/Makefile" ;;
+-  "kscreensaver/Makefile" ) CONFIG_FILES="$CONFIG_FILES kscreensaver/Makefile" ;;
+-  "ksmserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksmserver/Makefile" ;;
+-  "ksplashml/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/Makefile" ;;
+-  "ksplashml/kcmksplash/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/kcmksplash/Makefile" ;;
+-  "ksplashml/kcmksplash/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/kcmksplash/pics/Makefile" ;;
+-  "ksplashml/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/Makefile" ;;
+-  "ksplashml/pics/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/Makefile" ;;
+-  "ksplashml/pics/themes/blue-bend/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/blue-bend/Makefile" ;;
+-  "ksplashml/pics/themes/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/default/Makefile" ;;
+-  "ksplashml/pics/themes/default/locolor/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/default/locolor/Makefile" ;;
+-  "ksplashml/pics/themes/none/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/none/Makefile" ;;
+-  "ksplashml/pics/themes/simple/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/simple/Makefile" ;;
+-  "ksplashml/themeengine/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/Makefile" ;;
+-  "ksplashml/themeengine/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/default/Makefile" ;;
+-  "ksplashml/themeengine/redmond/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/redmond/Makefile" ;;
+-  "ksplashml/themeengine/redmond/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/redmond/pics/Makefile" ;;
+-  "ksplashml/themeengine/simple/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/simple/Makefile" ;;
+-  "ksplashml/themeengine/standard/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/standard/Makefile" ;;
+-  "ksplashml/themeengine/standard/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/standard/pics/Makefile" ;;
+-  "kstart/Makefile" ) CONFIG_FILES="$CONFIG_FILES kstart/Makefile" ;;
+-  "ksysguard/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/Makefile" ;;
+-  "ksysguard/CContLib/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/CContLib/Makefile" ;;
+-  "ksysguard/example/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/example/Makefile" ;;
+-  "ksysguard/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/gui/Makefile" ;;
+-  "ksysguard/gui/SensorDisplayLib/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/gui/SensorDisplayLib/Makefile" ;;
+-  "ksysguard/gui/ksgrd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/gui/ksgrd/Makefile" ;;
+-  "ksysguard/ksysguardd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Makefile" ;;
+-  "ksysguard/ksysguardd/FreeBSD/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/FreeBSD/Makefile" ;;
+-  "ksysguard/ksysguardd/Irix/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Irix/Makefile" ;;
+-  "ksysguard/ksysguardd/Linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Linux/Makefile" ;;
+-  "ksysguard/ksysguardd/NetBSD/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/NetBSD/Makefile" ;;
+-  "ksysguard/ksysguardd/OpenBSD/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/OpenBSD/Makefile" ;;
+-  "ksysguard/ksysguardd/Solaris/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Solaris/Makefile" ;;
+-  "ksysguard/ksysguardd/Tru64/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Tru64/Makefile" ;;
+-  "ksysguard/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/pics/Makefile" ;;
+-  "ksystraycmd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksystraycmd/Makefile" ;;
+-  "ktip/Makefile" ) CONFIG_FILES="$CONFIG_FILES ktip/Makefile" ;;
+-  "ktip/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ktip/pics/Makefile" ;;
+-  "kwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/Makefile" ;;
+-  "kwin/clients/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/Makefile" ;;
+-  "kwin/clients/b2/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/b2/Makefile" ;;
+-  "kwin/clients/b2/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/b2/config/Makefile" ;;
+-  "kwin/clients/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/default/Makefile" ;;
+-  "kwin/clients/default/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/default/config/Makefile" ;;
+-  "kwin/clients/keramik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/keramik/Makefile" ;;
+-  "kwin/clients/keramik/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/keramik/config/Makefile" ;;
+-  "kwin/clients/kwmtheme/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/kwmtheme/Makefile" ;;
+-  "kwin/clients/kwmtheme/cli_installer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/kwmtheme/cli_installer/Makefile" ;;
+-  "kwin/clients/laptop/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/laptop/Makefile" ;;
+-  "kwin/clients/modernsystem/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/modernsystem/Makefile" ;;
+-  "kwin/clients/modernsystem/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/modernsystem/config/Makefile" ;;
+-  "kwin/clients/plastik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/plastik/Makefile" ;;
+-  "kwin/clients/plastik/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/plastik/config/Makefile" ;;
+-  "kwin/clients/quartz/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/quartz/Makefile" ;;
+-  "kwin/clients/quartz/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/quartz/config/Makefile" ;;
+-  "kwin/clients/redmond/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/redmond/Makefile" ;;
+-  "kwin/clients/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/test/Makefile" ;;
+-  "kwin/clients/web/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/web/Makefile" ;;
+-  "kwin/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/data/Makefile" ;;
+-  "kwin/kcmkwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/Makefile" ;;
+-  "kwin/kcmkwin/kwindecoration/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwindecoration/Makefile" ;;
+-  "kwin/kcmkwin/kwinoptions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwinoptions/Makefile" ;;
+-  "kwin/kcmkwin/kwinrules/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwinrules/Makefile" ;;
+-  "kwin/killer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/killer/Makefile" ;;
+-  "kwin/kompmgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kompmgr/Makefile" ;;
+-  "kwin/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/lib/Makefile" ;;
+-  "kwin/oldheaders/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/oldheaders/Makefile" ;;
+-  "kwin/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/pics/Makefile" ;;
+-  "kwin/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/tools/Makefile" ;;
+-  "kwin/tools/decobenchmark/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/tools/decobenchmark/Makefile" ;;
+-  "kxkb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kxkb/Makefile" ;;
+-  "kxkb/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kxkb/pics/Makefile" ;;
+-  "l10n/Makefile" ) CONFIG_FILES="$CONFIG_FILES l10n/Makefile" ;;
+-  "libkonq/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkonq/Makefile" ;;
+-  "libkonq/favicons/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkonq/favicons/Makefile" ;;
+-  "libkonq/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkonq/pics/Makefile" ;;
+-  "libkonq/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkonq/tests/Makefile" ;;
+-  "nsplugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES nsplugins/Makefile" ;;
+-  "nsplugins/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES nsplugins/test/Makefile" ;;
+-  "nsplugins/viewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES nsplugins/viewer/Makefile" ;;
+-  "nsplugins/wrapper/Makefile" ) CONFIG_FILES="$CONFIG_FILES nsplugins/wrapper/Makefile" ;;
+-  "pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/Makefile" ;;
+-  "pics/crystalsvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/crystalsvg/Makefile" ;;
+-  "pics/wallpapers/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/wallpapers/Makefile" ;;
+-  "kdm/kfrontend/sessions/kde.desktop" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/sessions/kde.desktop" ;;
+-  "khelpcenter/searchhandlers/khc_docbookdig.pl" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/khc_docbookdig.pl" ;;
+-  "khelpcenter/searchhandlers/khc_htdig.pl" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/khc_htdig.pl" ;;
+-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
 +  case $ac_config_target in
 +    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
 +    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
@@ -74395,58 +57446,595 @@
 +    "khelpcenter/searchhandlers/khc_docbookdig.pl") CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/khc_docbookdig.pl" ;;
 +    "khelpcenter/searchhandlers/khc_htdig.pl") CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/khc_htdig.pl" ;;
 +
-+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+   { (exit 1); exit 1; }; };;
-+  esac
-+done
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
 +
-+
-+# If the user did not use the arguments to specify the items to instantiate,
-+# then the envvar interface is used.  Set only those that are not.
-+# We use the long form for the default assignment because of an extremely
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-+fi
-+
-+# Have a temporary directory for convenience.  Make it in the build tree
+ # 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
+@@ -58701,739 +58191,1013 @@
+ fi
+ 
+ # Have a temporary directory for convenience.  Make it in the build tree
+-# simply because there is no reason to put it here, and in addition,
 +# simply because there is no reason against having it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
+ # creating and moving files from /tmp can sometimes cause problems.
+-# Create a temporary directory, and hook for its removal unless debugging.
 +# Hook for its removal unless debugging.
 +# Note that there is a small window in which the directory will not be cleaned:
 +# after its creation but before its name has been assigned to `$tmp'.
-+$debug ||
-+{
+ $debug ||
+ {
+-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
 +  tmp=
 +  trap 'exit_status=$?
 +  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 +' 0
-+  trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+# Create a (secure) tmp directory for tmp files.
-+
-+{
+   trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
+-
+ # Create a (secure) tmp directory for tmp files.
+ 
+ {
+-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
 +  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+-  tmp=./confstat$$-$RANDOM
+-  (umask 077 && mkdir $tmp)
 +  tmp=./conf$$-$RANDOM
 +  (umask 077 && mkdir "$tmp")
-+} ||
-+{
-+   echo "$me: cannot create a temporary directory in ." >&2
-+   { (exit 1); exit 1; }
-+}
-+
-+#
+ } ||
+ {
+    echo "$me: cannot create a temporary directory in ." >&2
+    { (exit 1); exit 1; }
+ }
+ 
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<_ACEOF
+-
+ #
+-# CONFIG_FILES section.
 +# Set up the sed scripts for CONFIG_FILES section.
-+#
-+
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
+ #
+ 
+ # No need to generate the scripts if there are no CONFIG_FILES.
+ # This happens for instance when ./config.status config.h
+-if test -n "\$CONFIG_FILES"; then
+-  # Protect against being on the right side of a sed subst in config.status.
+-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+-s, at SHELL@,$SHELL,;t t
+-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+-s, at exec_prefix@,$exec_prefix,;t t
+-s, at prefix@,$prefix,;t t
+-s, at program_transform_name@,$program_transform_name,;t t
+-s, at bindir@,$bindir,;t t
+-s, at sbindir@,$sbindir,;t t
+-s, at libexecdir@,$libexecdir,;t t
+-s, at datadir@,$datadir,;t t
+-s, at sysconfdir@,$sysconfdir,;t t
+-s, at sharedstatedir@,$sharedstatedir,;t t
+-s, at localstatedir@,$localstatedir,;t t
+-s, at libdir@,$libdir,;t t
+-s, at includedir@,$includedir,;t t
+-s, at oldincludedir@,$oldincludedir,;t t
+-s, at infodir@,$infodir,;t t
+-s, at mandir@,$mandir,;t t
+-s, at build_alias@,$build_alias,;t t
+-s, at host_alias@,$host_alias,;t t
+-s, at target_alias@,$target_alias,;t t
+-s, at DEFS@,$DEFS,;t t
+-s, at ECHO_C@,$ECHO_C,;t t
+-s, at ECHO_N@,$ECHO_N,;t t
+-s, at ECHO_T@,$ECHO_T,;t t
+-s, at LIBS@,$LIBS,;t t
+-s, at build@,$build,;t t
+-s, at build_cpu@,$build_cpu,;t t
+-s, at build_vendor@,$build_vendor,;t t
+-s, at build_os@,$build_os,;t t
+-s, at host@,$host,;t t
+-s, at host_cpu@,$host_cpu,;t t
+-s, at host_vendor@,$host_vendor,;t t
+-s, at host_os@,$host_os,;t t
+-s, at target@,$target,;t t
+-s, at target_cpu@,$target_cpu,;t t
+-s, at target_vendor@,$target_vendor,;t t
+-s, at target_os@,$target_os,;t t
+-s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+-s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+-s, at INSTALL_DATA@,$INSTALL_DATA,;t t
+-s, at CYGPATH_W@,$CYGPATH_W,;t t
+-s, at PACKAGE@,$PACKAGE,;t t
+-s, at VERSION@,$VERSION,;t t
+-s, at ACLOCAL@,$ACLOCAL,;t t
+-s, at AUTOCONF@,$AUTOCONF,;t t
+-s, at AUTOMAKE@,$AUTOMAKE,;t t
+-s, at AUTOHEADER@,$AUTOHEADER,;t t
+-s, at MAKEINFO@,$MAKEINFO,;t t
+-s, at install_sh@,$install_sh,;t t
+-s, at STRIP@,$STRIP,;t t
+-s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
+-s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+-s, at mkdir_p@,$mkdir_p,;t t
+-s, at AWK@,$AWK,;t t
+-s, at SET_MAKE@,$SET_MAKE,;t t
+-s, at am__leading_dot@,$am__leading_dot,;t t
+-s, at AMTAR@,$AMTAR,;t t
+-s, at am__tar@,$am__tar,;t t
+-s, at am__untar@,$am__untar,;t t
+-s, at KDECONFIG@,$KDECONFIG,;t t
+-s, at kde_libs_prefix@,$kde_libs_prefix,;t t
+-s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
+-s, at CONF_FILES@,$CONF_FILES,;t t
+-s, at CC@,$CC,;t t
+-s, at CFLAGS@,$CFLAGS,;t t
+-s, at LDFLAGS@,$LDFLAGS,;t t
+-s, at CPPFLAGS@,$CPPFLAGS,;t t
+-s, at ac_ct_CC@,$ac_ct_CC,;t t
+-s, at EXEEXT@,$EXEEXT,;t t
+-s, at OBJEXT@,$OBJEXT,;t t
+-s, at DEPDIR@,$DEPDIR,;t t
+-s, at am__include@,$am__include,;t t
+-s, at am__quote@,$am__quote,;t t
+-s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
+-s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
+-s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+-s, at CCDEPMODE@,$CCDEPMODE,;t t
+-s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+-s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+-s, at CPP@,$CPP,;t t
+-s, at CXX@,$CXX,;t t
+-s, at CXXFLAGS@,$CXXFLAGS,;t t
+-s, at ac_ct_CXX@,$ac_ct_CXX,;t t
+-s, at CXXDEPMODE@,$CXXDEPMODE,;t t
+-s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+-s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
+-s, at WOVERLOADED_VIRTUAL@,$WOVERLOADED_VIRTUAL,;t t
+-s, at HAVE_GCC_VISIBILITY@,$HAVE_GCC_VISIBILITY,;t t
+-s, at unsermake_enable_pch_TRUE@,$unsermake_enable_pch_TRUE,;t t
+-s, at unsermake_enable_pch_FALSE@,$unsermake_enable_pch_FALSE,;t t
+-s, at USE_EXCEPTIONS@,$USE_EXCEPTIONS,;t t
+-s, at USE_RTTI@,$USE_RTTI,;t t
+-s, at CXXCPP@,$CXXCPP,;t t
+-s, at NOOPT_CXXFLAGS@,$NOOPT_CXXFLAGS,;t t
+-s, at NOOPT_CFLAGS@,$NOOPT_CFLAGS,;t t
+-s, at ENABLE_PERMISSIVE_FLAG@,$ENABLE_PERMISSIVE_FLAG,;t t
+-s, at LDFLAGS_AS_NEEDED@,$LDFLAGS_AS_NEEDED,;t t
+-s, at LDFLAGS_NEW_DTAGS@,$LDFLAGS_NEW_DTAGS,;t t
+-s, at KDE_USE_FINAL_TRUE@,$KDE_USE_FINAL_TRUE,;t t
+-s, at KDE_USE_FINAL_FALSE@,$KDE_USE_FINAL_FALSE,;t t
+-s, at KDE_USE_CLOSURE_TRUE@,$KDE_USE_CLOSURE_TRUE,;t t
+-s, at KDE_USE_CLOSURE_FALSE@,$KDE_USE_CLOSURE_FALSE,;t t
+-s, at KDE_NO_UNDEFINED@,$KDE_NO_UNDEFINED,;t t
+-s, at KDE_USE_NMCHECK_TRUE@,$KDE_USE_NMCHECK_TRUE,;t t
+-s, at KDE_USE_NMCHECK_FALSE@,$KDE_USE_NMCHECK_FALSE,;t t
+-s, at EGREP@,$EGREP,;t t
+-s, at LN_S@,$LN_S,;t t
+-s, at ECHO@,$ECHO,;t t
+-s, at AR@,$AR,;t t
+-s, at ac_ct_AR@,$ac_ct_AR,;t t
+-s, at RANLIB@,$RANLIB,;t t
+-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s, at F77@,$F77,;t t
+-s, at FFLAGS@,$FFLAGS,;t t
+-s, at ac_ct_F77@,$ac_ct_F77,;t t
+-s, at LIBTOOL@,$LIBTOOL,;t t
+-s, at KDE_PLUGIN@,$KDE_PLUGIN,;t t
+-s, at KDE_CHECK_PLUGIN@,$KDE_CHECK_PLUGIN,;t t
+-s, at MSGFMT@,$MSGFMT,;t t
+-s, at GMSGFMT@,$GMSGFMT,;t t
+-s, at XGETTEXT@,$XGETTEXT,;t t
+-s, at LIBUTIL@,$LIBUTIL,;t t
+-s, at LIBCOMPAT@,$LIBCOMPAT,;t t
+-s, at LIBCRYPT@,$LIBCRYPT,;t t
+-s, at LIBRESOLV@,$LIBRESOLV,;t t
+-s, at LIB_POLL@,$LIB_POLL,;t t
+-s, at FRAMEWORK_COREAUDIO@,$FRAMEWORK_COREAUDIO,;t t
+-s, at LIBSOCKET@,$LIBSOCKET,;t t
+-s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+-s, at LIBUCB@,$LIBUCB,;t t
+-s, at LIBDL@,$LIBDL,;t t
+-s, at KDE_USE_FPIE@,$KDE_USE_FPIE,;t t
+-s, at KDE_USE_PIE@,$KDE_USE_PIE,;t t
+-s, at include_x11_TRUE@,$include_x11_TRUE,;t t
+-s, at include_x11_FALSE@,$include_x11_FALSE,;t t
+-s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
+-s, at LIB_X11@,$LIB_X11,;t t
+-s, at LIB_XRENDER@,$LIB_XRENDER,;t t
+-s, at LIBSM@,$LIBSM,;t t
+-s, at X_INCLUDES@,$X_INCLUDES,;t t
+-s, at X_LDFLAGS@,$X_LDFLAGS,;t t
+-s, at x_includes@,$x_includes,;t t
+-s, at x_libraries@,$x_libraries,;t t
+-s, at QTE_NORTTI@,$QTE_NORTTI,;t t
+-s, at LIB_XEXT@,$LIB_XEXT,;t t
+-s, at LIBPTHREAD@,$LIBPTHREAD,;t t
+-s, at USE_THREADS@,$USE_THREADS,;t t
+-s, at KDE_MT_LDFLAGS@,$KDE_MT_LDFLAGS,;t t
+-s, at KDE_MT_LIBS@,$KDE_MT_LIBS,;t t
+-s, at USER_INCLUDES@,$USER_INCLUDES,;t t
+-s, at USER_LDFLAGS@,$USER_LDFLAGS,;t t
+-s, at LIBZ@,$LIBZ,;t t
+-s, at LIBPNG@,$LIBPNG,;t t
+-s, at LIBJPEG@,$LIBJPEG,;t t
+-s, at qt_libraries@,$qt_libraries,;t t
+-s, at qt_includes@,$qt_includes,;t t
+-s, at QT_INCLUDES@,$QT_INCLUDES,;t t
+-s, at QT_LDFLAGS@,$QT_LDFLAGS,;t t
+-s, at PERL@,$PERL,;t t
+-s, at MOC@,$MOC,;t t
+-s, at UIC@,$UIC,;t t
+-s, at UIC_TR@,$UIC_TR,;t t
+-s, at LIB_QT@,$LIB_QT,;t t
+-s, at LIB_QPE@,$LIB_QPE,;t t
+-s, at kde_qtver@,$kde_qtver,;t t
+-s, at KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t
+-s, at KDE_RPATH@,$KDE_RPATH,;t t
+-s, at X_RPATH@,$X_RPATH,;t t
+-s, at kde_libraries@,$kde_libraries,;t t
+-s, at kde_includes@,$kde_includes,;t t
+-s, at KDE_LDFLAGS@,$KDE_LDFLAGS,;t t
+-s, at KDE_INCLUDES@,$KDE_INCLUDES,;t t
+-s, at all_includes@,$all_includes,;t t
+-s, at all_libraries@,$all_libraries,;t t
+-s, at AUTODIRS@,$AUTODIRS,;t t
+-s, at include_ARTS_TRUE@,$include_ARTS_TRUE,;t t
+-s, at include_ARTS_FALSE@,$include_ARTS_FALSE,;t t
+-s, at MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t
+-s, at KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t
+-s, at KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t
+-s, at DCOPIDLNG@,$DCOPIDLNG,;t t
+-s, at DCOPIDL@,$DCOPIDL,;t t
+-s, at DCOPIDL2CPP@,$DCOPIDL2CPP,;t t
+-s, at DCOP_DEPENDENCIES@,$DCOP_DEPENDENCIES,;t t
+-s, at MCOPIDL@,$MCOPIDL,;t t
+-s, at ARTSCCONFIG@,$ARTSCCONFIG,;t t
+-s, at MEINPROC@,$MEINPROC,;t t
+-s, at KDE_XSL_STYLESHEET@,$KDE_XSL_STYLESHEET,;t t
+-s, at XMLLINT@,$XMLLINT,;t t
+-s, at kde_htmldir@,$kde_htmldir,;t t
+-s, at kde_appsdir@,$kde_appsdir,;t t
+-s, at kde_icondir@,$kde_icondir,;t t
+-s, at kde_sounddir@,$kde_sounddir,;t t
+-s, at kde_datadir@,$kde_datadir,;t t
+-s, at kde_locale@,$kde_locale,;t t
+-s, at kde_confdir@,$kde_confdir,;t t
+-s, at kde_kcfgdir@,$kde_kcfgdir,;t t
+-s, at kde_mimedir@,$kde_mimedir,;t t
+-s, at kde_wallpaperdir@,$kde_wallpaperdir,;t t
+-s, at kde_bindir@,$kde_bindir,;t t
+-s, at xdg_appsdir@,$xdg_appsdir,;t t
+-s, at xdg_menudir@,$xdg_menudir,;t t
+-s, at xdg_directorydir@,$xdg_directorydir,;t t
+-s, at kde_templatesdir@,$kde_templatesdir,;t t
+-s, at kde_servicesdir@,$kde_servicesdir,;t t
+-s, at kde_servicetypesdir@,$kde_servicetypesdir,;t t
+-s, at kde_moduledir@,$kde_moduledir,;t t
+-s, at kdeinitdir@,$kdeinitdir,;t t
+-s, at kde_styledir@,$kde_styledir,;t t
+-s, at kde_widgetdir@,$kde_widgetdir,;t t
+-s, at LIB_KDED@,$LIB_KDED,;t t
+-s, at LIB_KDECORE@,$LIB_KDECORE,;t t
+-s, at LIB_KDEUI@,$LIB_KDEUI,;t t
+-s, at LIB_KIO@,$LIB_KIO,;t t
+-s, at LIB_KJS@,$LIB_KJS,;t t
+-s, at LIB_SMB@,$LIB_SMB,;t t
+-s, at LIB_KAB@,$LIB_KAB,;t t
+-s, at LIB_KABC@,$LIB_KABC,;t t
+-s, at LIB_KHTML@,$LIB_KHTML,;t t
+-s, at LIB_KSPELL@,$LIB_KSPELL,;t t
+-s, at LIB_KPARTS@,$LIB_KPARTS,;t t
+-s, at LIB_KDEPRINT@,$LIB_KDEPRINT,;t t
+-s, at LIB_KUTILS@,$LIB_KUTILS,;t t
+-s, at LIB_KDEPIM@,$LIB_KDEPIM,;t t
+-s, at LIB_KIMPROXY@,$LIB_KIMPROXY,;t t
+-s, at LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t
+-s, at LIB_KDNSSD@,$LIB_KDNSSD,;t t
+-s, at LIB_KUNITTEST@,$LIB_KUNITTEST,;t t
+-s, at LIB_KSYCOCA@,$LIB_KSYCOCA,;t t
+-s, at LIB_KFILE@,$LIB_KFILE,;t t
+-s, at LIB_KFM@,$LIB_KFM,;t t
+-s, at PAMLIBS@,$PAMLIBS,;t t
+-s, at LIBSHADOW@,$LIBSHADOW,;t t
+-s, at LIBGEN@,$LIBGEN,;t t
+-s, at SETUIDFLAGS@,$SETUIDFLAGS,;t t
+-s, at PASSWDLIBS@,$PASSWDLIBS,;t t
+-s, at KDM_PAM_SERVICE@,$KDM_PAM_SERVICE,;t t
+-s, at KCHECKPASS_PAM_SERVICE@,$KCHECKPASS_PAM_SERVICE,;t t
+-s, at KSCREENSAVER_PAM_SERVICE@,$KSCREENSAVER_PAM_SERVICE,;t t
+-s, at LIBALIB@,$LIBALIB,;t t
+-s, at LIBRPC@,$LIBRPC,;t t
+-s, at LIBOSSAUDIO@,$LIBOSSAUDIO,;t t
+-s, at LIBCFG@,$LIBCFG,;t t
+-s, at LIBODM@,$LIBODM,;t t
+-s, at LIBCURSES@,$LIBCURSES,;t t
+-s, at LIBKSTAT@,$LIBKSTAT,;t t
+-s, at LIBDEVINFO@,$LIBDEVINFO,;t t
+-s, at JAVAC@,$JAVAC,;t t
+-s, at JAVAH@,$JAVAH,;t t
+-s, at JAR@,$JAR,;t t
+-s, at JVMLIBS@,$JVMLIBS,;t t
+-s, at jni_includes@,$jni_includes,;t t
+-s, at MD5SUM@,$MD5SUM,;t t
+-s, at MD5SUM_CUT@,$MD5SUM_CUT,;t t
+-s, at XTESTLIB@,$XTESTLIB,;t t
+-s, at LIB_XCURSOR@,$LIB_XCURSOR,;t t
+-s, at have_xcursor_TRUE@,$have_xcursor_TRUE,;t t
+-s, at have_xcursor_FALSE@,$have_xcursor_FALSE,;t t
+-s, at QTDOCDIR@,$QTDOCDIR,;t t
+-s, at KDE_HAVE_DOT@,$KDE_HAVE_DOT,;t t
+-s, at DOXYGEN@,$DOXYGEN,;t t
+-s, at DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t
+-s, at DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t
+-s, at KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t
+-s, at KDE_BINDIR@,$KDE_BINDIR,;t t
+-s, at LIBART_LIBS@,$LIBART_LIBS,;t t
+-s, at LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
+-s, at LIBART_RPATH@,$LIBART_RPATH,;t t
+-s, at RUN_KAPPFINDER@,$RUN_KAPPFINDER,;t t
+-s, at include_kcontrol_access_TRUE@,$include_kcontrol_access_TRUE,;t t
+-s, at include_kcontrol_access_FALSE@,$include_kcontrol_access_FALSE,;t t
+-s, at include_kcontrol_accessibility_TRUE@,$include_kcontrol_accessibility_TRUE,;t t
+-s, at include_kcontrol_accessibility_FALSE@,$include_kcontrol_accessibility_FALSE,;t t
+-s, at SSL_INCLUDES@,$SSL_INCLUDES,;t t
+-s, at SSL_LDFLAGS@,$SSL_LDFLAGS,;t t
+-s, at LIBSSL@,$LIBSSL,;t t
+-s, at DPMSINC@,$DPMSINC,;t t
+-s, at DPMSLIB@,$DPMSLIB,;t t
+-s, at LIBFONTCONFIG_LIBS@,$LIBFONTCONFIG_LIBS,;t t
+-s, at LIBFONTCONFIG_CFLAGS@,$LIBFONTCONFIG_CFLAGS,;t t
+-s, at LIBFONTCONFIG_RPATH@,$LIBFONTCONFIG_RPATH,;t t
+-s, at LIB_TRU64_MACH@,$LIB_TRU64_MACH,;t t
+-s, at GLINC@,$GLINC,;t t
+-s, at GLLIB@,$GLLIB,;t t
+-s, at COMPILE_GL_INFO_TRUE@,$COMPILE_GL_INFO_TRUE,;t t
+-s, at COMPILE_GL_INFO_FALSE@,$COMPILE_GL_INFO_FALSE,;t t
+-s, at LIBUSBCONFIG@,$LIBUSBCONFIG,;t t
+-s, at USB_LIBS@,$USB_LIBS,;t t
+-s, at USB_CFLAGS@,$USB_CFLAGS,;t t
+-s, at include_kcontrol_joystick_TRUE@,$include_kcontrol_joystick_TRUE,;t t
+-s, at include_kcontrol_joystick_FALSE@,$include_kcontrol_joystick_FALSE,;t t
+-s, at LIBFREETYPE_LIBS@,$LIBFREETYPE_LIBS,;t t
+-s, at LIBFREETYPE_CFLAGS@,$LIBFREETYPE_CFLAGS,;t t
+-s, at LIBFREETYPE_RPATH@,$LIBFREETYPE_RPATH,;t t
+-s, at UNAME@,$UNAME,;t t
+-s, at LIB_FONT_ENC@,$LIB_FONT_ENC,;t t
+-s, at LIBXFT_LIB@,$LIBXFT_LIB,;t t
+-s, at include_fontinst_tn_TRUE@,$include_fontinst_tn_TRUE,;t t
+-s, at include_fontinst_tn_FALSE@,$include_fontinst_tn_FALSE,;t t
+-s, at include_kcontrol_kfontinst_TRUE@,$include_kcontrol_kfontinst_TRUE,;t t
+-s, at include_kcontrol_kfontinst_FALSE@,$include_kcontrol_kfontinst_FALSE,;t t
+-s, at LIB_XRANDR@,$LIB_XRANDR,;t t
+-s, at include_kcontrol_randr_TRUE@,$include_kcontrol_randr_TRUE,;t t
+-s, at include_kcontrol_randr_FALSE@,$include_kcontrol_randr_FALSE,;t t
+-s, at include_kcontrol_smartcard_TRUE@,$include_kcontrol_smartcard_TRUE,;t t
+-s, at include_kcontrol_smartcard_FALSE@,$include_kcontrol_smartcard_FALSE,;t t
+-s, at include_kcontrol_usbview_TRUE@,$include_kcontrol_usbview_TRUE,;t t
+-s, at include_kcontrol_usbview_FALSE@,$include_kcontrol_usbview_FALSE,;t t
+-s, at install_usbids_TRUE@,$install_usbids_TRUE,;t t
+-s, at install_usbids_FALSE@,$install_usbids_FALSE,;t t
+-s, at include_kcontrol_view1394_TRUE@,$include_kcontrol_view1394_TRUE,;t t
+-s, at include_kcontrol_view1394_FALSE@,$include_kcontrol_view1394_FALSE,;t t
+-s, at LIB_XSS@,$LIB_XSS,;t t
+-s, at LIB_XF86MISC@,$LIB_XF86MISC,;t t
+-s, at nogroup@,$nogroup,;t t
+-s, at LIBXDMCP@,$LIBXDMCP,;t t
+-s, at KRB4_INCS@,$KRB4_INCS,;t t
+-s, at KRB4_LIBS@,$KRB4_LIBS,;t t
+-s, at KRB4_RPATH@,$KRB4_RPATH,;t t
+-s, at LIB_LIBS@,$LIB_LIBS,;t t
+-s, at LIBPOSIX4@,$LIBPOSIX4,;t t
+-s, at KRB5_INCS@,$KRB5_INCS,;t t
+-s, at KRB5_LIBS@,$KRB5_LIBS,;t t
+-s, at KRB5_RPATH@,$KRB5_RPATH,;t t
+-s, at LIB_ARTS@,$LIB_ARTS,;t t
+-s, at ARTS_CFLAGS@,$ARTS_CFLAGS,;t t
+-s, at KHOTKEYS_ARTS_SUBDIR@,$KHOTKEYS_ARTS_SUBDIR,;t t
+-s, at LIB_KVM@,$LIB_KVM,;t t
+-s, at LIB_XCOMPOSITE@,$LIB_XCOMPOSITE,;t t
+-s, at LIB_XFIXES@,$LIB_XFIXES,;t t
+-s, at SASL2_LIBS@,$SASL2_LIBS,;t t
+-s, at LIBBZ2@,$LIBBZ2,;t t
+-s, at include_BZIP2_TRUE@,$include_BZIP2_TRUE,;t t
+-s, at include_BZIP2_FALSE@,$include_BZIP2_FALSE,;t t
+-s, at LIB_LBER@,$LIB_LBER,;t t
+-s, at LDAP_INCS@,$LDAP_INCS,;t t
+-s, at LDAP_LIBS@,$LDAP_LIBS,;t t
+-s, at LDAP_RPATH@,$LDAP_RPATH,;t t
+-s, at include_kioslave_ldap_TRUE@,$include_kioslave_ldap_TRUE,;t t
+-s, at include_kioslave_ldap_FALSE@,$include_kioslave_ldap_FALSE,;t t
+-s, at LINUXCDPOLLING@,$LINUXCDPOLLING,;t t
+-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+-s, at HAL_CFLAGS@,$HAL_CFLAGS,;t t
+-s, at HAL_LIBS@,$HAL_LIBS,;t t
+-s, at HAL_INCS@,$HAL_INCS,;t t
+-s, at DBUS_CFLAGS@,$DBUS_CFLAGS,;t t
+-s, at DBUS_LIBS@,$DBUS_LIBS,;t t
+-s, at DBUS_INCS@,$DBUS_INCS,;t t
+-s, at DBUSQT_INCS@,$DBUSQT_INCS,;t t
+-s, at DBUSQT_LIBS@,$DBUSQT_LIBS,;t t
+-s, at HALBACKEND@,$HALBACKEND,;t t
+-s, at include_media_linuxcdpolling_TRUE@,$include_media_linuxcdpolling_TRUE,;t t
+-s, at include_media_linuxcdpolling_FALSE@,$include_media_linuxcdpolling_FALSE,;t t
+-s, at include_media_halbackend_TRUE@,$include_media_halbackend_TRUE,;t t
+-s, at include_media_halbackend_FALSE@,$include_media_halbackend_FALSE,;t t
+-s, at SMBCLIENT_EXTRA_LIBS@,$SMBCLIENT_EXTRA_LIBS,;t t
+-s, at include_kioslave_smb_TRUE@,$include_kioslave_smb_TRUE,;t t
+-s, at include_kioslave_smb_FALSE@,$include_kioslave_smb_FALSE,;t t
+-s, at LIB_EXR@,$LIB_EXR,;t t
+-s, at EXR_FLAGS@,$EXR_FLAGS,;t t
+-s, at include_EXR_MODULES_TRUE@,$include_EXR_MODULES_TRUE,;t t
+-s, at include_EXR_MODULES_FALSE@,$include_EXR_MODULES_FALSE,;t t
+-s, at LIBMALLOC@,$LIBMALLOC,;t t
+-s, at LIB_XINERAMA@,$LIB_XINERAMA,;t t
+-s, at include_ksysguardd_TRUE@,$include_ksysguardd_TRUE,;t t
+-s, at include_ksysguardd_FALSE@,$include_ksysguardd_FALSE,;t t
+-s, at include_ksysguardd_linux_TRUE@,$include_ksysguardd_linux_TRUE,;t t
+-s, at include_ksysguardd_linux_FALSE@,$include_ksysguardd_linux_FALSE,;t t
+-s, at include_ksysguardd_freebsd_TRUE@,$include_ksysguardd_freebsd_TRUE,;t t
+-s, at include_ksysguardd_freebsd_FALSE@,$include_ksysguardd_freebsd_FALSE,;t t
+-s, at include_ksysguardd_netbsd_TRUE@,$include_ksysguardd_netbsd_TRUE,;t t
+-s, at include_ksysguardd_netbsd_FALSE@,$include_ksysguardd_netbsd_FALSE,;t t
+-s, at include_ksysguardd_solaris_TRUE@,$include_ksysguardd_solaris_TRUE,;t t
+-s, at include_ksysguardd_solaris_FALSE@,$include_ksysguardd_solaris_FALSE,;t t
+-s, at include_ksysguardd_tru64_TRUE@,$include_ksysguardd_tru64_TRUE,;t t
+-s, at include_ksysguardd_tru64_FALSE@,$include_ksysguardd_tru64_FALSE,;t t
+-s, at include_ksysguardd_irix_TRUE@,$include_ksysguardd_irix_TRUE,;t t
+-s, at include_ksysguardd_irix_FALSE@,$include_ksysguardd_irix_FALSE,;t t
+-s, at include_ksysguardd_openbsd_TRUE@,$include_ksysguardd_openbsd_TRUE,;t t
+-s, at include_ksysguardd_openbsd_FALSE@,$include_ksysguardd_openbsd_FALSE,;t t
+-s, at LIBHOSTS@,$LIBHOSTS,;t t
+-s, at LIBSENSORS@,$LIBSENSORS,;t t
+-s, at supports_i8k_TRUE@,$supports_i8k_TRUE,;t t
+-s, at supports_i8k_FALSE@,$supports_i8k_FALSE,;t t
+-s, at LIB_DNSSD@,$LIB_DNSSD,;t t
+-s, at HAVE_DNSSD_TRUE@,$HAVE_DNSSD_TRUE,;t t
+-s, at HAVE_DNSSD_FALSE@,$HAVE_DNSSD_FALSE,;t t
+-s, at include_kompmgr_TRUE@,$include_kompmgr_TRUE,;t t
+-s, at include_kompmgr_FALSE@,$include_kompmgr_FALSE,;t t
+-s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
+-s, at libkonq_SUBDIR_included_TRUE@,$libkonq_SUBDIR_included_TRUE,;t t
+-s, at libkonq_SUBDIR_included_FALSE@,$libkonq_SUBDIR_included_FALSE,;t t
+-s, at applnk_SUBDIR_included_TRUE@,$applnk_SUBDIR_included_TRUE,;t t
+-s, at applnk_SUBDIR_included_FALSE@,$applnk_SUBDIR_included_FALSE,;t t
+-s, at doc_SUBDIR_included_TRUE@,$doc_SUBDIR_included_TRUE,;t t
+-s, at doc_SUBDIR_included_FALSE@,$doc_SUBDIR_included_FALSE,;t t
+-s, at drkonqi_SUBDIR_included_TRUE@,$drkonqi_SUBDIR_included_TRUE,;t t
+-s, at drkonqi_SUBDIR_included_FALSE@,$drkonqi_SUBDIR_included_FALSE,;t t
+-s, at kappfinder_SUBDIR_included_TRUE@,$kappfinder_SUBDIR_included_TRUE,;t t
+-s, at kappfinder_SUBDIR_included_FALSE@,$kappfinder_SUBDIR_included_FALSE,;t t
+-s, at kate_SUBDIR_included_TRUE@,$kate_SUBDIR_included_TRUE,;t t
+-s, at kate_SUBDIR_included_FALSE@,$kate_SUBDIR_included_FALSE,;t t
+-s, at kcheckpass_SUBDIR_included_TRUE@,$kcheckpass_SUBDIR_included_TRUE,;t t
+-s, at kcheckpass_SUBDIR_included_FALSE@,$kcheckpass_SUBDIR_included_FALSE,;t t
+-s, at kcminit_SUBDIR_included_TRUE@,$kcminit_SUBDIR_included_TRUE,;t t
+-s, at kcminit_SUBDIR_included_FALSE@,$kcminit_SUBDIR_included_FALSE,;t t
+-s, at kdcop_SUBDIR_included_TRUE@,$kdcop_SUBDIR_included_TRUE,;t t
+-s, at kdcop_SUBDIR_included_FALSE@,$kdcop_SUBDIR_included_FALSE,;t t
+-s, at kdebugdialog_SUBDIR_included_TRUE@,$kdebugdialog_SUBDIR_included_TRUE,;t t
+-s, at kdebugdialog_SUBDIR_included_FALSE@,$kdebugdialog_SUBDIR_included_FALSE,;t t
+-s, at kdeeject_SUBDIR_included_TRUE@,$kdeeject_SUBDIR_included_TRUE,;t t
+-s, at kdeeject_SUBDIR_included_FALSE@,$kdeeject_SUBDIR_included_FALSE,;t t
+-s, at kdepasswd_SUBDIR_included_TRUE@,$kdepasswd_SUBDIR_included_TRUE,;t t
+-s, at kdepasswd_SUBDIR_included_FALSE@,$kdepasswd_SUBDIR_included_FALSE,;t t
+-s, at kdeprint_SUBDIR_included_TRUE@,$kdeprint_SUBDIR_included_TRUE,;t t
+-s, at kdeprint_SUBDIR_included_FALSE@,$kdeprint_SUBDIR_included_FALSE,;t t
+-s, at kdesu_SUBDIR_included_TRUE@,$kdesu_SUBDIR_included_TRUE,;t t
+-s, at kdesu_SUBDIR_included_FALSE@,$kdesu_SUBDIR_included_FALSE,;t t
+-s, at kdialog_SUBDIR_included_TRUE@,$kdialog_SUBDIR_included_TRUE,;t t
+-s, at kdialog_SUBDIR_included_FALSE@,$kdialog_SUBDIR_included_FALSE,;t t
+-s, at kdmlib_SUBDIR_included_TRUE@,$kdmlib_SUBDIR_included_TRUE,;t t
+-s, at kdmlib_SUBDIR_included_FALSE@,$kdmlib_SUBDIR_included_FALSE,;t t
+-s, at kfind_SUBDIR_included_TRUE@,$kfind_SUBDIR_included_TRUE,;t t
+-s, at kfind_SUBDIR_included_FALSE@,$kfind_SUBDIR_included_FALSE,;t t
+-s, at khelpcenter_SUBDIR_included_TRUE@,$khelpcenter_SUBDIR_included_TRUE,;t t
+-s, at khelpcenter_SUBDIR_included_FALSE@,$khelpcenter_SUBDIR_included_FALSE,;t t
+-s, at khotkeys_SUBDIR_included_TRUE@,$khotkeys_SUBDIR_included_TRUE,;t t
+-s, at khotkeys_SUBDIR_included_FALSE@,$khotkeys_SUBDIR_included_FALSE,;t t
+-s, at kioslave_SUBDIR_included_TRUE@,$kioslave_SUBDIR_included_TRUE,;t t
+-s, at kioslave_SUBDIR_included_FALSE@,$kioslave_SUBDIR_included_FALSE,;t t
+-s, at klipper_SUBDIR_included_TRUE@,$klipper_SUBDIR_included_TRUE,;t t
+-s, at klipper_SUBDIR_included_FALSE@,$klipper_SUBDIR_included_FALSE,;t t
+-s, at kmenuedit_SUBDIR_included_TRUE@,$kmenuedit_SUBDIR_included_TRUE,;t t
+-s, at kmenuedit_SUBDIR_included_FALSE@,$kmenuedit_SUBDIR_included_FALSE,;t t
+-s, at knetattach_SUBDIR_included_TRUE@,$knetattach_SUBDIR_included_TRUE,;t t
+-s, at knetattach_SUBDIR_included_FALSE@,$knetattach_SUBDIR_included_FALSE,;t t
+-s, at konsole_SUBDIR_included_TRUE@,$konsole_SUBDIR_included_TRUE,;t t
+-s, at konsole_SUBDIR_included_FALSE@,$konsole_SUBDIR_included_FALSE,;t t
+-s, at kpager_SUBDIR_included_TRUE@,$kpager_SUBDIR_included_TRUE,;t t
+-s, at kpager_SUBDIR_included_FALSE@,$kpager_SUBDIR_included_FALSE,;t t
+-s, at kpersonalizer_SUBDIR_included_TRUE@,$kpersonalizer_SUBDIR_included_TRUE,;t t
+-s, at kpersonalizer_SUBDIR_included_FALSE@,$kpersonalizer_SUBDIR_included_FALSE,;t t
+-s, at kreadconfig_SUBDIR_included_TRUE@,$kreadconfig_SUBDIR_included_TRUE,;t t
+-s, at kreadconfig_SUBDIR_included_FALSE@,$kreadconfig_SUBDIR_included_FALSE,;t t
+-s, at kscreensaver_SUBDIR_included_TRUE@,$kscreensaver_SUBDIR_included_TRUE,;t t
+-s, at kscreensaver_SUBDIR_included_FALSE@,$kscreensaver_SUBDIR_included_FALSE,;t t
+-s, at ksplashml_SUBDIR_included_TRUE@,$ksplashml_SUBDIR_included_TRUE,;t t
+-s, at ksplashml_SUBDIR_included_FALSE@,$ksplashml_SUBDIR_included_FALSE,;t t
+-s, at kstart_SUBDIR_included_TRUE@,$kstart_SUBDIR_included_TRUE,;t t
+-s, at kstart_SUBDIR_included_FALSE@,$kstart_SUBDIR_included_FALSE,;t t
+-s, at ksysguard_SUBDIR_included_TRUE@,$ksysguard_SUBDIR_included_TRUE,;t t
+-s, at ksysguard_SUBDIR_included_FALSE@,$ksysguard_SUBDIR_included_FALSE,;t t
+-s, at ksystraycmd_SUBDIR_included_TRUE@,$ksystraycmd_SUBDIR_included_TRUE,;t t
+-s, at ksystraycmd_SUBDIR_included_FALSE@,$ksystraycmd_SUBDIR_included_FALSE,;t t
+-s, at ktip_SUBDIR_included_TRUE@,$ktip_SUBDIR_included_TRUE,;t t
+-s, at ktip_SUBDIR_included_FALSE@,$ktip_SUBDIR_included_FALSE,;t t
+-s, at kwin_SUBDIR_included_TRUE@,$kwin_SUBDIR_included_TRUE,;t t
+-s, at kwin_SUBDIR_included_FALSE@,$kwin_SUBDIR_included_FALSE,;t t
+-s, at kxkb_SUBDIR_included_TRUE@,$kxkb_SUBDIR_included_TRUE,;t t
+-s, at kxkb_SUBDIR_included_FALSE@,$kxkb_SUBDIR_included_FALSE,;t t
+-s, at l10n_SUBDIR_included_TRUE@,$l10n_SUBDIR_included_TRUE,;t t
+-s, at l10n_SUBDIR_included_FALSE@,$l10n_SUBDIR_included_FALSE,;t t
+-s, at nsplugins_SUBDIR_included_TRUE@,$nsplugins_SUBDIR_included_TRUE,;t t
+-s, at nsplugins_SUBDIR_included_FALSE@,$nsplugins_SUBDIR_included_FALSE,;t t
+-s, at pics_SUBDIR_included_TRUE@,$pics_SUBDIR_included_TRUE,;t t
+-s, at pics_SUBDIR_included_FALSE@,$pics_SUBDIR_included_FALSE,;t t
+-s, at konqueror_SUBDIR_included_TRUE@,$konqueror_SUBDIR_included_TRUE,;t t
+-s, at konqueror_SUBDIR_included_FALSE@,$konqueror_SUBDIR_included_FALSE,;t t
+-s, at ksmserver_SUBDIR_included_TRUE@,$ksmserver_SUBDIR_included_TRUE,;t t
+-s, at ksmserver_SUBDIR_included_FALSE@,$ksmserver_SUBDIR_included_FALSE,;t t
+-s, at kicker_SUBDIR_included_TRUE@,$kicker_SUBDIR_included_TRUE,;t t
+-s, at kicker_SUBDIR_included_FALSE@,$kicker_SUBDIR_included_FALSE,;t t
+-s, at kcontrol_SUBDIR_included_TRUE@,$kcontrol_SUBDIR_included_TRUE,;t t
+-s, at kcontrol_SUBDIR_included_FALSE@,$kcontrol_SUBDIR_included_FALSE,;t t
+-s, at kdesktop_SUBDIR_included_TRUE@,$kdesktop_SUBDIR_included_TRUE,;t t
+-s, at kdesktop_SUBDIR_included_FALSE@,$kdesktop_SUBDIR_included_FALSE,;t t
+-s, at kdm_SUBDIR_included_TRUE@,$kdm_SUBDIR_included_TRUE,;t t
+-s, at kdm_SUBDIR_included_FALSE@,$kdm_SUBDIR_included_FALSE,;t t
+-s, at LIBOBJS@,$LIBOBJS,;t t
+-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+-CEOF
+-
+-_ACEOF
+-
+-  cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Split the substitutions into bite-sized pieces for seds with
+-  # small command number limits, like on Digital OSF/1 and HP-UX.
+-  ac_max_sed_lines=48
+-  ac_sed_frag=1 # Number of current file.
+-  ac_beg=1 # First line for current file.
+-  ac_end=$ac_max_sed_lines # Line after last line for current file.
+-  ac_more_lines=:
+-  ac_sed_cmds=
+-  while $ac_more_lines; do
+-    if test $ac_beg -gt 1; then
+-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    else
+-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    fi
+-    if test ! -s $tmp/subs.frag; then
+-      ac_more_lines=false
+-    else
+-      # The purpose of the label and of the branching condition is to
+-      # speed up the sed processing (if there are no `@' at all, there
+-      # is no need to browse any of the substitutions).
+-      # These are the two extra sed commands mentioned above.
+-      (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+-      if test -z "$ac_sed_cmds"; then
+-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+-      else
+-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+-      fi
+-      ac_sed_frag=`expr $ac_sed_frag + 1`
+-      ac_beg=$ac_end
+-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+-    fi
+-  done
+-  if test -z "$ac_sed_cmds"; then
+-    ac_sed_cmds=cat
 +if test -n "$CONFIG_FILES"; then
 +
 +_ACEOF
@@ -74563,7 +58151,8 @@
 +   { (exit 1); exit 1; }; }
 +  else
 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
+   fi
+-fi # test -n "$CONFIG_FILES"
 +done
 +
 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
@@ -75167,7 +58756,7 @@
 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 +  fi
 +done
-+
+ 
 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
 +if test -n "$ac_eof"; then
 +  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
@@ -75192,7 +58781,7 @@
 +:end
 +s/|#_!!_#|//g
 +CEOF$ac_eof
-+_ACEOF
+ _ACEOF
 +
 +
 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -75210,7 +58799,17 @@
 +}'
 +fi
 +
-+cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+-  case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-	cat >$tmp/stdin
+-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
 +fi # test -n "$CONFIG_FILES"
 +
 +
@@ -75273,14 +58872,27 @@
 +    *:-:* | *:-) cat >"$tmp/stdin";;
 +    esac
 +    ;;
-+  esac
-+
+   esac
+ 
+-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 +  ac_dir=`$as_dirname -- "$ac_file" ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$ac_file" : 'X\(//\)[^/]' \| \
-+	 X"$ac_file" : 'X\(//\)$' \| \
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$ac_file" : 'X\(//\)[^/]' \| \
+ 	 X"$ac_file" : 'X\(//\)$' \| \
+-	 X"$ac_file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
 +	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$ac_file" |
+ echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
@@ -75303,7 +58915,10 @@
 +  -*) as_dir=./$as_dir;;
 +  esac
 +  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-+    as_dirs=
+     as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
 +    while :; do
 +      case $as_dir in #(
 +      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
@@ -75311,11 +58926,18 @@
 +      esac
 +      as_dirs="'$as_qdir' $as_dirs"
 +      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
 +	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$as_dir" |
+ echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
@@ -75334,17 +58956,27 @@
 +	  }
 +	  s/.*/./; q'`
 +      test -d "$as_dir" && break
-+    done
+     done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
 +    test -z "$as_dirs" || eval "mkdir $as_dirs"
 +  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
 +echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+  ac_builddir=.
-+
+    { (exit 1); exit 1; }; }; }
+-
+   ac_builddir=.
+ 
+-if test "$ac_dir" != .; then
 +case "$ac_dir" in
 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +*)
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
 +  # A ".." for each directory in $ac_dir_suffix.
 +  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
 +  case $ac_top_builddir_sub in
@@ -75356,36 +58988,129 @@
 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
 +# for backward compatibility:
 +ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
+ 
+ case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
 +  .)  # We are building in place.
-+    ac_srcdir=.
+     ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
 +    ac_top_srcdir=$ac_top_builddir_sub
 +    ac_abs_top_srcdir=$ac_pwd ;;
 +  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 +    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
+ 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
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
+ 
 +  case $ac_mode in
 +  :F)
 +  #
 +  # CONFIG_FILE
 +  #
-+
-+  case $INSTALL in
-+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ 
+   case $INSTALL in
+   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
 +  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+  esac
+   esac
 +_ACEOF
-+
+ 
+-  if test x"$ac_file" != x-; then
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-    rm -f "$ac_file"
+-  fi
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    configure_input=
+-  else
+-    configure_input="$ac_file.  "
+-  fi
+-  configure_input=$configure_input"Generated from `echo $ac_file_in |
+-				     sed 's,.*/,,'` by configure."
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
 +cat >>$CONFIG_STATUS <<\_ACEOF
 +# If the template does not know about datarootdir, expand it.
 +# FIXME: This hack should be removed a few years after 2.60.
@@ -75415,18 +59140,58 @@
 +  s&@mandir@&$mandir&g
 +    s&\\\${datarootdir}&$datarootdir&g' ;;
 +esac
-+_ACEOF
+ _ACEOF
 +
 +# Neutralize VPATH when `$srcdir' = `.'.
 +# Shell code in configure.ac might set extrasub.
 +# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF
-+  sed "$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+ cat >>$CONFIG_STATUS <<_ACEOF
+   sed "$ac_vpsub
+ $extrasub
+@@ -59441,248 +59205,130 @@
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s, at configure_input@,$configure_input,;t t
+-s, at srcdir@,$ac_srcdir,;t t
+-s, at abs_srcdir@,$ac_abs_srcdir,;t t
+-s, at top_srcdir@,$ac_top_srcdir,;t t
+-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+-s, at builddir@,$ac_builddir,;t t
+-s, at abs_builddir@,$ac_abs_builddir,;t t
+-s, at top_builddir@,$ac_top_builddir,;t t
+-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
+-s, at INSTALL@,$ac_INSTALL,;t t
+-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+-  rm -f $tmp/stdin
+-  if test x"$ac_file" != x-; then
+-    mv $tmp/out $ac_file
+-  else
+-    cat $tmp/out
+-    rm -f $tmp/out
+-  fi
+-
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_HEADER section.
+-#
+-
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
+-ac_dB='[	 ].*$,\1#\2'
+-ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
 +s&@configure_input@&$configure_input&;t t
 +s&@top_builddir@&$ac_top_builddir_sub&;t t
 +s&@srcdir@&$ac_srcdir&;t t
@@ -75447,19 +59212,93 @@
 +which seems to be undefined.  Please make sure it is defined." >&5
 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 +which seems to be undefined.  Please make sure it is defined." >&2;}
-+
+ 
+-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
 +  rm -f "$tmp/stdin"
-+  case $ac_file in
+   case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-	cat >$tmp/stdin
+-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
 +  -) cat "$tmp/out"; rm -f "$tmp/out";;
 +  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-+  esac
+   esac
+-
+-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 # Do quote $f, to prevent DOS paths from being IFS'd.
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
+-  # Remove the trailing spaces.
+-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
+-
 + ;;
 +  :H)
 +  #
 +  # CONFIG_HEADER
 +  #
-+_ACEOF
-+
+ _ACEOF
+ 
+-# Transform confdefs.h into two sed scripts, `conftest.defines' and
+-# `conftest.undefs', that substitutes the proper values into
+-# config.h.in to produce config.h.  The first handles `#define'
+-# templates, and the second `#undef' templates.
+-# And first: Protect against being on the right side of a sed subst in
+-# config.status.  Protect against being in an unquoted here document
+-# in config.status.
+-rm -f conftest.defines conftest.undefs
+-# Using a here document instead of a string reduces the quoting nightmare.
+-# Putting comments in sed scripts is not portable.
+-#
+-# `end' is used to avoid that the second main sed command (meant for
+-# 0-ary CPP macros) applies to n-ary macro definitions.
+-# See the Autoconf documentation for `clear'.
+-cat >confdef2sed.sed <<\_ACEOF
+-s/[\\&,]/\\&/g
+-s,[\\$`],\\&,g
+-t clear
+-: clear
+-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+-t end
+-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+-: end
+-_ACEOF
+-# If some macros were called several times there might be several times
+-# the same #defines, which is useless.  Nevertheless, we may not want to
+-# sort them, since we want the *last* AC-DEFINE to be honored.
+-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+-rm -f confdef2sed.sed
 +# Transform confdefs.h into a sed script `conftest.defines', that
 +# substitutes the proper values into config.h.in to produce config.h.
 +rm -f conftest.defines conftest.tail
@@ -75479,7 +59318,8 @@
 +ac_dB='\\)[	 (].*,\\1define\\2'
 +ac_dC=' '
 +ac_dD=' ,'
-+
+ 
+-# This sed command replaces #undef with comments.  This is necessary, for
 +uniq confdefs.h |
 +  sed -n '
 +	t rset
@@ -75495,8 +59335,10 @@
 +
 +# Remove the space that was appended to ease matching.
 +# Then replace #undef with comments.  This is necessary, for
-+# example, in the case of _POSIX_SOURCE, which is predefined and required
-+# on some systems where configure will not decide to define it.
+ # example, in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+-cat >>conftest.undefs <<\_ACEOF
+-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
 +# (The regexp can be short, since the line contains either #define or #undef.)
 +echo 's/ $//
 +s,^[	 #]*u.*,/* & */,' >>conftest.defines
@@ -75522,51 +59364,230 @@
 +/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
 +b
 +:def
-+_ACEOF
+ _ACEOF
+-
+-# Break up conftest.defines because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+-echo '  :' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.defines >/dev/null
+-do
+-  # Write a limited-size here document to $tmp/defines.sed.
+-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#define' lines.
+-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
 +  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-+  echo 'CEOF
+   echo 'CEOF
+-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
+-  rm -f $tmp/in
+-  mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
 +    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
 +  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
 +  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
 +  grep . conftest.tail >/dev/null || break
-+  rm -f conftest.defines
-+  mv conftest.tail conftest.defines
-+done
+   rm -f conftest.defines
+   mv conftest.tail conftest.defines
+ done
+-rm -f conftest.defines
+-echo '  fi # grep' >>$CONFIG_STATUS
+-echo >>$CONFIG_STATUS
+-
+-# Break up conftest.undefs because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.undefs >/dev/null
+-do
+-  # Write a limited-size here document to $tmp/undefs.sed.
+-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#undef'
+-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+-  echo 'CEOF
+-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+-  rm -f $tmp/in
+-  mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+-  rm -f conftest.undefs
+-  mv conftest.tail conftest.undefs
+-done
+-rm -f conftest.undefs
 +rm -f conftest.defines conftest.tail
-+
+ 
 +echo "ac_result=$ac_in" >>$CONFIG_STATUS
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+  if test x"$ac_file" != x-; then
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    echo "/* Generated by configure.  */" >$tmp/config.h
+-  else
+-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
+-  fi
+-  cat $tmp/in >>$tmp/config.h
+-  rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
 +    echo "/* $configure_input  */" >"$tmp/config.h"
 +    cat "$ac_result" >>"$tmp/config.h"
 +    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-+echo "$as_me: $ac_file is unchanged" >&6;}
-+    else
-+      rm -f $ac_file
+       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$ac_file" : 'X\(//\)[^/]' \| \
+-	 X"$ac_file" : 'X\(//\)$' \| \
+-	 X"$ac_file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-      { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_dir" : 'X\(//\)[^/]' \| \
+-	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
+-
+       rm -f $ac_file
+-      mv $tmp/config.h $ac_file
 +      mv "$tmp/config.h" $ac_file
-+    fi
-+  else
+     fi
+   else
+-    cat $tmp/config.h
+-    rm -f $tmp/config.h
 +    echo "/* $configure_input  */"
 +    cat "$ac_result"
-+  fi
+   fi
 +  rm -f "$tmp/out12"
-+# Compute $ac_file's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $ac_file | $ac_file:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
+ # Compute $ac_file's index in $config_headers.
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+@@ -59693,135 +59339,39 @@
+       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+   esac
+ done
+-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
 +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X$ac_file : 'X\(//\)[^/]' \| \
-+	 X$ac_file : 'X\(//\)$' \| \
+ $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X$ac_file : 'X\(//\)[^/]' \| \
+ 	 X$ac_file : 'X\(//\)$' \| \
+-	 X$ac_file : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
 +	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-+echo X$ac_file |
+ echo X$ac_file |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_COMMANDS section.
+-#
+-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
+-	 X"$ac_dest" : 'X\(//\)$' \| \
+-	 X"$ac_dest" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_dest" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_dir" : 'X\(//\)[^/]' \| \
+-	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
+-
+-  ac_builddir=.
+-
+-if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
+-
+-case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
+-    ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
+-    ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
@@ -75585,30 +59606,78 @@
 +	  }
 +	  s/.*/./; q'`/stamp-h$_am_stamp_count
 + ;;
-+
+ 
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
 +  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
 +echo "$as_me: executing $ac_file commands" >&6;}
 + ;;
 +  esac
-+
-+
+ 
+ 
+-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+-echo "$as_me: executing $ac_dest commands" >&6;}
+-  case $ac_dest in
+-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
 +  case $ac_file$ac_mode in
 +    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+  # 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.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # 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
+   # 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.
+@@ -59831,18 +59381,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
+-    dirpart=`(dirname "$mf") 2>/dev/null ||
 +    dirpart=`$as_dirname -- "$mf" ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$mf" : 'X\(//\)[^/]' \| \
+ 	 X"$mf" : 'X\(//\)$' \| \
+-	 X"$mf" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
 +	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$mf" |
+ echo X"$mf" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
@@ -75626,33 +59695,31 @@
 +	    q
 +	  }
 +	  s/.*/./; q'`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
+   else
+     continue
+   fi
+@@ -59864,53 +59425,79 @@
+        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+     # Make sure the directory exists.
+     test -f "$dirpart/$file" && continue
+-    fdir=`(dirname "$file") 2>/dev/null ||
 +    fdir=`$as_dirname -- "$file" ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$file" : 'X\(//\)[^/]' \| \
+ 	 X"$file" : 'X\(//\)$' \| \
+-	 X"$file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
 +	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$file" |
+ echo X"$file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    { if $as_mkdir_p; then
+-    mkdir -p $dirpart/$fdir
+-  else
+-    as_dir=$dirpart/$fdir
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
@@ -75675,7 +59742,10 @@
 +  -*) as_dir=./$as_dir;;
 +  esac
 +  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-+    as_dirs=
+     as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
 +    while :; do
 +      case $as_dir in #(
 +      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
@@ -75683,11 +59753,18 @@
 +      esac
 +      as_dirs="'$as_qdir' $as_dirs"
 +      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
 +	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$as_dir" |
+ echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
@@ -75706,493905 +59783,51423 @@
 +	  }
 +	  s/.*/./; q'`
 +      test -d "$as_dir" && break
-+    done
+     done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
 +    test -z "$as_dirs" || eval "mkdir $as_dirs"
 +  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
 +echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
-+done
-+ ;;
+    { (exit 1); exit 1; }; }; }
+-
+     # echo "creating $dirpart/$file"
+     echo '# dummy' > "$dirpart/$file"
+   done
+ done
+  ;;
 +
-+  esac
+   esac
+-done
+-_ACEOF
 +done # for ac_tag
-+
-+
-+{ (exit 0); exit 0; }
-+_ACEOF
-+if test "x$with_fast_perl" = "xyes"; then    
-+  perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS    \
-+    || mv $CONFIG_STATUS.bak $CONFIG_STATUS    
-+  rm -f $CONFIG_STATUS.bak
-+fi    
-+chmod +x $CONFIG_STATUS
-+ac_clean_files=$ac_clean_files_save
-+
-+
-+# configure is writing to config.log, and then calls config.status.
-+# config.status does its own redirection, appending to config.log.
-+# Unfortunately, on DOS this fails, as config.log is still kept open
-+# by configure, so config.status won't be able to write to it; its
-+# output is simply discarded.  So we exec the FD to /dev/null,
-+# effectively closing config.log, so it can be properly (re)opened and
-+# appended to by config.status.  When coming back to configure, we
-+# need to make the FD available again.
-+if test "$no_create" != yes; then
-+  ac_cs_success=:
-+  ac_config_status_args=
-+  test "$silent" = yes &&
-+    ac_config_status_args="$ac_config_status_args --quiet"
-+  exec 5>/dev/null
-+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-+  exec 5>>config.log
-+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-+  # would make configure fail if this is the last instruction.
-+  $ac_cs_success || { (exit 1); exit 1; }
-+fi
-+
-+if test x$have_gl = xno; then
-+  echo ""
-+  echo "You are missing"
-+  if test "$ac_cv_header_GL_gl_h" = "no"; then
-+    echo "    - OpenGL (mesa)"
-+  fi
-+  if test "$ac_cv_header_GL_glu_h" = "no"; then
-+    echo "    - GLU"
-+  fi
-+  echo "OpenGL information module has been disabled."
-+  echo ""
-+  all_tests=bad
-+fi
-+if test "x$with_libusb" = xcheck && test "x$have_libusb" = xno; then
-+  echo ""
-+  echo "Logitech mouse support is disabled. Provide libusb to enable it."
-+  echo ""
-+fi
-+
-+if test -z "$FONTINST_SUBDIR"; then
-+  echo ""
-+  echo "KFontInstall control module got disabled from compilation"
-+  echo "because of missing FreeType 2.x libraries/headers."
-+  echo "You can download the freetype library from http://www.freetype.org/."
-+  echo ""
-+  all_tests=bad
-+fi
-+
-+
-+if $kdm_no_Xau; then
-+  { echo "$as_me:$LINENO: WARNING: Cannot build KDM! Make sure that libXau.a is installed!" >&5
-+echo "$as_me: WARNING: Cannot build KDM! Make sure that libXau.a is installed!" >&2;}
-+fi
-+if $kdm_no_Xdmcp; then
-+  { echo "$as_me:$LINENO: WARNING: Cannot build KDM! Make sure that libXdmcp.a and Xdmcp.h
-+are installed or use --without-xdmcp to disable XDMCP support!" >&5
-+echo "$as_me: WARNING: Cannot build KDM! Make sure that libXdmcp.a and Xdmcp.h
-+are installed or use --without-xdmcp to disable XDMCP support!" >&2;}
-+fi
-+
-+if test -z "$SASL2_LIBS"; then
-+  echo ""
-+  echo "cyrus-sasl 2 library is missing. The pop3 and smtp ioslaves will lack of a lot of authentication methods."
-+  echo "See http://asg.web.cmu.edu/sasl/sasl-library.html or your distribution's packages."
-+  echo ""
-+  all_tests=bad
-+fi
-+if test "x$with_samba" = xcheck && test "x$have_libsmbclient" = xno; then
-+  echo ""
-+  echo "You're missing libsmbclient from samba 3.0"
-+  echo "KDE will not be able to browse windows shares without it,"
-+  echo "consider installing it."
-+  echo "Look at kioslave/smb/libsmbclient-HOWTO.txt"
-+  echo ""
-+  all_tests=bad
-+fi
-+
-+if test "d58a0606ed616820de291d594602665d" '!=' `echo fnord | $MD5SUM | cut -d ' ' $MD5SUM_CUT` ; then
-+  echo ""
-+  echo "Your md5 program ( $MD5SUM | cut -d ' ' $MD5SUM_CUT ) produces broken output."
-+  echo "The fish:// IOSlave may not function correctly."
-+  echo ""
-+fi
-+
-+if test "$EXRSTATUS" = "no"; then
-+  echo ""
-+  echo "No OpenEXR Libraries were found"
-+  echo "Install the OpenEXR package (from http://www.openexr.org)"
-+  echo "if you want EXR image format support"
-+  echo ""
-+fi
-+
-+if test "$EXRSTATUS" = "old"; then
-+  echo ""
-+  echo "OpenEXR libraries were found, but at least version 1.1.0 is required"
-+  echo "Install a newer OpenEXR package (from http://www.openexr.org)"
-+  echo "if you want EXR image format support"
-+  echo ""
-+fi
-+
-+# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
-+if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
-+  # And if so, warn when they don't match
-+  if test "$kde_libs_prefix" != "$given_prefix"; then
-+    # And if kde doesn't know about the prefix yet
-+    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
-+    if test $? -ne 0; then
-+      echo ""
-+      echo "Warning: you chose to install this package in $given_prefix,"
-+      echo "but KDE was found in $kde_libs_prefix."
-+      echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
-+      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
-+      echo "Then restart KDE."
-+      echo ""
-+    fi
-+  fi
-+fi
-+
-+if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
-+  echo ""
-+  echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
-+  echo "was not included. Therefore, GCC symbol visibility support remains disabled."
-+  echo ""
-+  echo "For better performance, consider including the Qt visibility supporting patch"
-+  echo "located at:"
-+  echo ""
-+  echo "http://bugs.kde.org/show_bug.cgi?id=109386"
-+  echo ""
-+  echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
-+  echo "everything will continue to work just fine without it."
-+  echo ""
-+fi
-+
-+if test "$all_tests" = "bad"; then
-+  if test ! "$cache_file" = "/dev/null"; then
-+    echo ""
-+    echo "Please remove the file $cache_file after changing your setup"
-+    echo "so that configure will find the changes next time."
-+    echo ""
-+  fi
-+else
-+  echo ""
-+  echo "Good - your configure finished. Start make now"
-+  echo ""
-+fi
---- configure.files
-+++ configure.files
-@@ -0,0 +1,52 @@
-+./admin/configure.in.min
-+configure.in.in
-+./kappfinder/configure.in.in
-+./kcontrol/access/configure.in.in
-+./kcontrol/accessibility/configure.in.in
-+./kcontrol/crypto/configure.in.in
-+./kcontrol/energy/configure.in.in
-+./kcontrol/fonts/configure.in.in
-+./kcontrol/info/configure.in.bot
-+./kcontrol/info/configure.in.in
-+./kcontrol/input/configure.in.bot
-+./kcontrol/input/configure.in.in
-+./kcontrol/joystick/configure.in.in
-+./kcontrol/kfontinst/configure.in.bot
-+./kcontrol/kfontinst/configure.in.in
-+./kcontrol/nics/configure.in.in
-+./kcontrol/randr/configure.in.in
-+./kcontrol/screensaver/configure.in.in
-+./kcontrol/smartcard/configure.in.in
-+./kcontrol/usbview/configure.in.in
-+./kcontrol/view1394/configure.in.in
-+./kdeprint/configure.in.in
-+./kdeprint/kprinter/configure.in.in
-+./kdesktop/configure.in.in
-+./kdesktop/lock/configure.in.in
-+./kdesu/configure.in.in
-+./kdm/configure.in.bot
-+./kdm/configure.in.in
-+./khelpcenter/configure.in.in
-+./khotkeys/configure.in.in
-+./kicker/applets/naughty/configure.in.in
-+./kicker/extensions/kasbar/configure.in.in
-+./kicker/taskmanager/configure.in.in
-+./kioslave/configure.in.bot
-+./kioslave/configure.in.in
-+./kioslave/filter/configure.in.in
-+./kioslave/fish/configure.in.in
-+./kioslave/ldap/configure.in.in
-+./kioslave/media/configure.in.in
-+./kioslave/smb/configure.in.bot
-+./kioslave/smb/configure.in.in
-+./kioslave/thumbnail/configure.in.in
-+./klipper/configure.in.in
-+./konqueror/preloader/configure.in.in
-+./konsole/configure.in.in
-+./ksmserver/configure.in.in
-+./ksplashml/themeengine/simple/configure.in.in
-+./ksysguard/configure.in.in
-+./ksysguard/ksysguardd/configure.in.in
-+./kwin/kompmgr/configure.in.in
-+./kxkb/configure.in.in
-+configure.in.bot
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ { (exit 0); exit 0; }
+ _ACEOF
 --- configure.in
 +++ configure.in
-@@ -0,0 +1,2702 @@
-+dnl =======================================================
-+dnl FILE: ./admin/configure.in.min
-+dnl =======================================================
+@@ -40,7 +40,9 @@
+ AC_ARG_PROGRAM
+ 
+ dnl Automake doc recommends to do this only here. (Janos)
+-AM_INIT_AUTOMAKE(kdebase, "3.5.6") dnl searches for some needed programs
++AM_INIT_AUTOMAKE(kdebase.dfsg.1, "3.5.6") dnl searches for some needed programs
 +
-+dnl    This file is part of the KDE libraries/packages
-+dnl    Copyright (C) 2001 Stephan Kulow (coolo at kde.org)
-+ 
-+dnl    This file is free software; you can redistribute it and/or
-+dnl    modify it under the terms of the GNU Library General Public
-+dnl    License as published by the Free Software Foundation; either
-+dnl    version 2 of the License, or (at your option) any later version.
-+ 
-+dnl    This library is distributed in the hope that it will be useful,
-+dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+dnl    Library General Public License for more details.
-+ 
-+dnl    You should have received a copy of the GNU Library General Public License
-+dnl    along with this library; see the file COPYING.LIB.  If not, write to
-+dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+dnl    Boston, MA 02110-1301, USA.
-+
-+# Original Author was Kalle at kde.org
-+# I lifted it in some mater. (Stephan Kulow)
-+# I used much code from Janos Farkas
-+
-+dnl Process this file with autoconf to produce a configure script.
-+
-+AC_INIT(acinclude.m4) dnl a source file from your sub dir
-+
-+dnl This is so we can use kde-common
-+AC_CONFIG_AUX_DIR(admin)
-+
-+dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
-+unset CDPATH
-+
-+dnl Checking host/target/build systems, for make, install etc.
-+AC_CANONICAL_SYSTEM 
-+dnl Perform program name transformation
-+AC_ARG_PROGRAM
-+
-+dnl Automake doc recommends to do this only here. (Janos)
-+AM_INIT_AUTOMAKE(kdebase-3.5.6.dfsg.1, "3.5.5") dnl searches for some needed programs
-+
 +AM_MAINTAINER_MODE
-+
-+KDE_SET_PREFIX
-+
-+dnl generate the config header
-+AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-+
-+dnl Checks for programs.
-+AC_CHECK_COMPILERS
-+AC_ENABLE_SHARED(yes)
-+AC_ENABLE_STATIC(no)
-+KDE_PROG_LIBTOOL
-+
-+dnl for NLS support. Call them in this order!
-+dnl WITH_NLS is for the po files
-+AM_KDE_WITH_NLS
-+
-+dnl KDE_USE_QT
-+AC_PATH_KDE
-+dnl =======================================================
-+dnl FILE: configure.in.in
-+dnl =======================================================
-+
-+#MIN_CONFIG
-+
-+KDE_ENABLE_HIDDEN_VISIBILITY
-+
-+dnl PAM, shadow passwords, libcrypt
-+KDE_PASSWDLIBS
-+
-+DEF_PAM_SERVICE(kdm, kdm, KDM)
-+DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS)
-+DEF_PAM_SERVICE(kss, kscreensaver, KSCREENSAVER)
-+
-+dnl Checks for header files.
-+AC_HEADER_DIRENT
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS(sys/time.h crypt.h \
-+	sys/select.h sys/ioctl.h sys/stropts.h stropts.h termio.h termios.h sys/termios.h \
-+	lastlog.h sys/socket.h sys/sockio.h \
-+	sys/m_wait.h ncurses.h paths.h login_cap.h syslog.h \
-+	sys/wait.h sys/ucred.h sys/mount.h floatingpoint.h fstab.h mntent.h \
-+	Alib.h libutil.h util.h time.h limits.h vfork.h string.h float.h \
-+	math.h nan.h ieeefp.h
-+)
-+AC_CHECK_HEADER(pty.h)
-+AC_CHECK_FUNC(ptsname,,)
-+
-+
-+dnl Checks for Alib on HP-UX (added by deller, Apr 29 1999)
-+AC_CHECK_LIB(Alib, main, [LIBALIB="-lAlib"]) dnl HP-UX network audio server
-+AC_SUBST(LIBALIB)
-+
-+dnl Checks for RPC functions
-+AC_CHECK_FUNC(clnttcp_create, , [
-+  AC_CHECK_LIB(nsl, clnttcp_create, [LIBRPC="-lnsl"])])
-+AC_SUBST(LIBRPC)
-+
-+dnl Check for ossaudio on NetBSD
-+AC_CHECK_LIB(ossaudio, main, [LIBOSSAUDIO="-lossaudio"])
-+AC_SUBST(LIBOSSAUDIO)
-+
-+dnl Check for AIX stuff
-+AC_CHECK_LIB(cfg, main, [LIBCFG="-lcfg"]) dnl for AIX
-+AC_SUBST(LIBCFG)
-+AC_CHECK_LIB(odm, main, [LIBODM="-lodm"]) dnl for AIX
-+AC_SUBST(LIBODM)
-+
-+dnl SMB checks moved to their own configure.in.in
-+
-+kde_have_setupterm=yes
-+AC_CHECK_LIB(curses, setupterm, [LIBCURSES=-lcurses],
-+  AC_CHECK_LIB(ncurses, setupterm, [LIBCURSES=-lncurses],
-+    AC_CHECK_LIB(mytinfo, setupterm, [LIBCURSES=-lmytinfo],
-+       kde_have_setupterm=no)))
-+
-+AC_SUBST(LIBCURSES)
-+
-+if test "$kde_have_setupterm" = "yes"; then
-+  AC_DEFINE_UNQUOTED(HAVE_SETUPTERM, 1, [Define if you have setupterm in -l(n)curses])
-+fi
-+
-+AC_CHECK_FUNC(res_init, ,
-+  AC_CHECK_LIB(resolv, res_init, [LIBRESOLV="-lresolv"], , $LIBSOCKET)) dnl for Sun
-+
-+AC_SUBST(LIBRESOLV)
-+
-+dnl Checks for typedefs, structures, and compiler characteristics.
-+AC_LANG_CPLUSPLUS
-+AC_HEADER_TIME
-+
-+dnl check if the compiler has bool
-+AC_CHECK_BOOL
-+AC_LANG_C
-+AC_C_LONG_DOUBLE
-+AC_TYPE_GETGROUPS
-+
-+dnl for libsmb
-+AC_CHECK_SIZEOF(char,1)
-+AC_CHECK_SIZEOF(short,2)
-+AC_CHECK_SIZEOF(int,4)
-+AC_CHECK_SIZEOF(long,4)
-+AC_C_BIGENDIAN
-+
-+AC_CHECK_FUNCS(socket powl sqrtl strdup getdtablesize setpgid nice seteuid vsyslog initgroups setgroups getgroups grantpt pw_encrypt setpriority getpt unlockpt ptsname waitpid getpassphrase)
-+AC_CHECK_MKSTEMPS
-+AC_CHECK_SETENV
-+AC_CHECK_UNSETENV
-+AC_CHECK_GETDOMAINNAME
-+AC_CHECK_GETHOSTNAME
-+AC_CHECK_USLEEP
-+AC_CHECK_RANDOM
-+AC_CHECK_S_ISSOCK
-+AC_CHECK_KDEMAXPATHLEN
-+AC_MSG_CHECKING([if it's safe to enable UTMP])
-+
-+case "$host_os" in
-+linux*) utmp_support=yes;
-+     ;;
-+freebsd*) utmp_support=yes;
-+     ;;
-+kfreebsd*-gnu) utmp_support=yes;
-+     ;;
-+*) utmp_support=no;
-+esac
-+
-+AC_MSG_RESULT($utmp_support)
-+
-+if test "$utmp_support" = yes; then
-+   AC_DEFINE_UNQUOTED(UTMP_SUPPORT, 1, [Define if you want to use utmp entries])
-+fi
-+
-+AC_CHECK_UTMP_FILE
-+
-+dnl Checks for Solaris' libkstat
-+kde_have_kstat=yes
-+AC_CHECK_LIB(kstat, kstat_open, [LIBKSTAT=-lkstat], kde_have_kstat=no)
-+AC_SUBST(LIBKSTAT)
-+if test "$kde_have_kstat" = "yes"; then
-+  AC_DEFINE(HAVE_KSTAT, 1, [Defines if you have Solaris' libkstat])
-+fi
-+
-+dnl Checks for libdevinfo (Solaris 7 and later)
-+dnl since the library is available on earlier Solaris releases (but
-+dnl with a completely different and undocumented interface),
-+dnl we have to verfy that the required header is present as well
-+AC_CHECK_HEADER(libdevinfo.h,
-+	kde_have_libdevinfo_h=yes,
-+	kde_have_libdevinfo_h=no)
-+if test "$kde_have_libdevinfo_h" = "yes"; then
-+   kde_have_libdevinfo_lib=yes
-+   AC_CHECK_LIB(devinfo, di_init, [LIBDEVINFO=-ldevinfo], kde_have_libdevinfo_lib=no)
-+   if test "$kde_have_libdevinfo_lib" = "yes"; then
-+      AC_DEFINE(HAVE_LIBDEVINFO_H, 1, [Defines if you have libdevinfo of Solaris 7 or later])
-+      AC_SUBST(LIBDEVINFO)
-+   fi
-+fi
-+
-+dnl check for java
-+KDE_CHECK_JAVA_DIR
-+
-+dnl check for an md5sum implementation. the GNU versions
-+dnl produce different output from the FreeBSD / Solaris 
-+dnl versions, so MD5SUM_CUT shows how to retrieve the
-+dnl checksum from the output.
-+MD5SUM_CUT="-f 1"
-+AC_PATH_PROGS(MD5SUM, [md5sum gmd5sum], [])
-+if test -z "$MD5SUM" ; then
-+  AC_PATH_PROG(MD5SUM, [md5], [])
-+  if test -z "$MD5SUM" ; then
-+    AC_PATH_PROG(MD5SUM, [md5], [], [/sbin])
-+  fi
-+  if test -z "$MD5SUM" ; then
-+    AC_MSG_WARN([No md5sum, gmd5sum, or md5 was found. The fish IOSlave cannot be compiled.])
-+    # Will fail anyway, but in a better way than a blank command.
-+    MD5SUM="md5sum"
-+    MD5SUM_CUT="-f 1"
-+  else
-+    MD5SUM_CUT="-f 4"
-+  fi
-+fi
-+AC_SUBST(MD5SUM_CUT)
-+
-+dnl -----  Checks for X11 extensions -----
-+ac_save_ldflags="$LDFLAGS"
-+LDFLAGS="$X_LDFLAGS"
-+
-+dnl --- XTEST check
-+XTESTLIB=
-+KDE_CHECK_HEADER(X11/extensions/XTest.h,
-+    [AC_CHECK_LIB( Xtst, XTestFakeKeyEvent,
-+	[AC_DEFINE(HAVE_XTEST, 1, [Define if you have the XTest extension])
-+	 XTESTLIB=-lXtst],
-+	, [ $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
-+    ])
-+AC_SUBST(XTESTLIB)
-+
-+dnl --- XKB check
-+KDE_CHECK_HEADER(X11/XKBlib.h,
-+    [AC_CHECK_LIB( X11, XkbLockModifiers,
-+	[AC_DEFINE(HAVE_XKB, 1, [Define if you have the XKB extension])],
-+	, [ $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
-+     AC_CHECK_LIB( X11, XkbSetPerClientControls,
-+	[AC_DEFINE(HAVE_XKBSETPERCLIENTCONTROLS, 1, [Define if you have XkbSetPerClientControls])],
-+	, [ $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
-+    ], [], [#include <X11/Xlib.h>])
-+
-+dnl --- Xcursor check (not technically an extension)
-+KDE_CHECK_HEADERS(X11/Xcursor/Xcursor.h,
-+    [KDE_CHECK_LIB(Xcursor, XcursorSupportsARGB, [
-+	LIB_XCURSOR=-lXcursor
-+	AC_DEFINE_UNQUOTED(HAVE_XCURSOR, 1, [Define to 1 if you have Xcursor])
-+    ], [ LIB_XCURSOR= ], [ $X_PRE_LIBS -lX11 $X_EXTRA_LIBS ])],
-+    [ LIB_XCURSOR= ], [#include <X11/Xlib.h>])
-+AC_SUBST(LIB_XCURSOR)
-+AM_CONDITIONAL(have_xcursor, test "$LIB_XCURSOR" = -lXcursor)
-+
-+dnl XRender check
-+KDE_CHECK_HEADER(X11/extensions/Xrender.h, [xrender_h=yes], [xrender_h=no])
-+if test "$xrender_h" = yes; then
-+  KDE_CHECK_LIB(Xrender, XRenderComposite, [
-+    LIB_XRENDER=-lXrender
-+    AC_DEFINE_UNQUOTED(HAVE_XRENDER, 1, [Defined if your system has XRender support])
-+  ], [], -lXext -lX11 $X_EXTRA_LIBS)
-+else
-+  LIB_XRENDER=
-+fi
-+AC_SUBST(LIB_XRENDER)
-+
-+LDFLAGS="$ac_save_ldflags"
-+dnl ----- end of X11 extension checks -----
-+
-+
-+CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
-+
-+KDE_INIT_DOXYGEN([KDE base API Reference], [Version $VERSION])
-+
-+dnl Ok, kdebase has _sooo_ many Makefiles, that the check for uniqueness
-+dnl of those filenames in the list of the files (done by autoconf macros
-+dnl itself) is taking more that nine minutes (!).  For kdebase only we take
-+dnl out that test.  (matz at kde.org)
-+m4_define([_AC_CONFIG_UNIQUE], [])dnl
-+
-+AH_VERBATIM(_osf_stuff, [
-+#if !defined(HAVE_SETEUID)
-+#define seteuid(_eu) setresuid(-1, _eu, -1)
-+#endif
-+])
-+
-+AH_VERBATIM(_broken_xkb, [
-+#if defined(__osf__) || defined(__APPLE__)
-+#define AVOID_XKB                 /* for konsole to avoid XKB and XTEST */
-+#endif
-+])
-+
-+dnl this is for kdm and kcontrol
-+KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir)
-+AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory])
-+KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir)
-+AC_DEFINE_UNQUOTED(KDE_DATADIR, "$KDE_DATADIR", [KDE's static data directory])
-+KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
-+AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
-+AC_SUBST(KDE_BINDIR)
-+
-+dnl libart is used by kdm, kcontrol and thumbnails code in kioslaves
-+KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-+  AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
-+])
-+
-+if test -n "$LIBART_CONFIG"; then
-+  vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+  if test -n "$vers" && test "$vers" -ge 2003008
-+  then
-+     LIBART_LIBS="`$LIBART_CONFIG --libs`"
-+     LIBART_RPATH=
-+     for args in $LIBART_LIBS; do
-+	  case $args in
-+	    -L*)
-+  	       LIBART_RPATH="$LIBART_RPATH $args"
-+ 	       ;;
-+          esac
-+     done
-+     LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
-+     LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
-+
-+     AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
-+  else
-+     AC_MSG_WARN([You need at least libart 2.3.8])
-+  fi
-+fi
-+
-+
-+AC_SUBST(LIBART_LIBS)
-+AC_SUBST(LIBART_CFLAGS)
-+AC_SUBST(LIBART_RPATH)
-+
-+AC_ARG_WITH([composite],
-+  AC_HELP_STRING([--without-composite], [Disable Xcomposite support (default: check)]) )
-+
-+dnl =======================================================
-+dnl FILE: ./kappfinder/configure.in.in
-+dnl =======================================================
-+
-+if test -z "$RUN_KAPPFINDER"; then
-+  RUN_KAPPFINDER="no"
-+fi
-+AC_SUBST(RUN_KAPPFINDER)
-+dnl =======================================================
-+dnl FILE: ./kcontrol/access/configure.in.in
-+dnl =======================================================
-+
-+ACCESS_SUBDIR=
-+KDE_CHECK_HEADER(X11/extensions/XKBstr.h, ACCESS_SUBDIR=access, ,
-+[
-+#include <X11/Xlib.h>
-+])
-+
-+AM_CONDITIONAL(include_kcontrol_access, test -n "$ACCESS_SUBDIR")
-+dnl =======================================================
-+dnl FILE: ./kcontrol/accessibility/configure.in.in
-+dnl =======================================================
-+
-+ACCESSIBILITY_SUBDIR=
-+KDE_CHECK_HEADER(X11/extensions/XKBstr.h, ACCESSIBILITY_SUBDIR=accessibility)
-+AM_CONDITIONAL(include_kcontrol_accessibility, test -n "$ACCESSIBILITY_SUBDIR")
-+dnl =======================================================
-+dnl FILE: ./kcontrol/crypto/configure.in.in
-+dnl =======================================================
-+
-+KDE_CHECK_SSL
-+dnl =======================================================
-+dnl FILE: ./kcontrol/energy/configure.in.in
-+dnl =======================================================
-+
-+AC_HAVE_DPMS()
-+dnl =======================================================
-+dnl FILE: ./kcontrol/fonts/configure.in.in
-+dnl =======================================================
-+
-+KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
-+        KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
-+            AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ])
-+        ])
-+])
-+
-+if test -n "$PKGCONFIG"; then
-+  vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+  if test -n "$vers" && test "$vers" -ge 1000000
-+  then
-+     LIBFONTCONFIG_LIBS="`$PKGCONFIG fontconfig --libs`"
-+     LIBFONTCONFIG_RPATH=
-+     for args in $LIBFONTCONFIG_LIBS; do
-+          case $args in
-+            -L*)
-+               LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+               ;;
-+          esac
-+     done
-+     LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | sed -e "s/-L/-R/g"`
-+     LIBFONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`"
-+
-+     AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library])
-+  fi
-+fi
-+
-+if test -n "$FONTCONFIG_CONFIG"; then
-+  vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+  if test -n "$vers" && test "$vers" -ge 1000000
-+  then
-+     LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`"
-+     LIBFONTCONFIG_RPATH=
-+     for args in $LIBFONTCONFIG_LIBS; do
-+          case $args in
-+            -L*)
-+               LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+               ;;
-+          esac
-+     done
-+     LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | sed -e "s/-L/-R/g"`
-+     LIBFONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`"
-+
-+     AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library])
-+  fi
-+fi
-+
-+AC_SUBST(LIBFONTCONFIG_LIBS)
-+AC_SUBST(LIBFONTCONFIG_CFLAGS)
-+AC_SUBST(LIBFONTCONFIG_RPATH)
-+dnl =======================================================
-+dnl FILE: ./kcontrol/info/configure.in.in
-+dnl =======================================================
-+
-+# libmach for Tru64
-+# linux/raw.h for Linux
-+# devinfo.h, libdevinfo for the list of {IRQ,DMA,IOPORTS/MEMRANGES} for FreeBSD
-+
-+case "$host" in
-+  *-*-osf*)
-+    AC_CHECK_LIB(mach, vm_statistics, LIB_TRU64_MACH="-lmach")dnl
-+    ;;
-+  *-*-linux*)
-+    AC_CHECK_HEADERS(linux/raw.h sys/raw.h)dnl
-+    ;;
-+  *-*-freebsd*)
-+    AC_CHECK_HEADERS(devinfo.h)
-+    AC_CHECK_LIB(devinfo, devinfo_foreach_rman, LIBDEVINFO="-ldevinfo")
-+    ;;
-+esac
-+AC_SUBST(LIB_TRU64_MACH)
-+
-+AC_HAVE_GL( have_gl=yes, have_gl=no )
-+AM_CONDITIONAL(COMPILE_GL_INFO, test x$have_gl = xyes)
-+
-+KDE_CHECK_LONG_LONG
-+dnl =======================================================
-+dnl FILE: ./kcontrol/input/configure.in.in
-+dnl =======================================================
-+
-+AC_ARG_WITH(libusb,
-+    [AC_HELP_STRING(--with-libusb,
-+        [enable control of some mouse models through libusb @<:@default=check@:>@])],
-+    [], with_libusb=check)
-+
-+USB_LIBS=
-+USB_CFLAGS=
-+have_libusb=no
-+if test "x$with_libusb" != xno; then
-+    AC_PATH_PROG(LIBUSBCONFIG,libusb-config,no)
-+    if test $LIBUSBCONFIG != "no"; then
-+        USB_LIBS="$($LIBUSBCONFIG --libs)"
-+        USB_CFLAGS="$($LIBUSBCONFIG --cflags)"
-+    
-+        AC_CHECK_LIB(usb,main,
-+            [have_libusb=yes
-+             AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb])],
-+            [], [$USB_LIBS]
-+        )
-+    fi
-+    if test "x$with_libusb" != xcheck && test "x$have_libusb" = xno; then
-+        AC_MSG_ERROR([--with-libusb was given, but test for libusb failed])
-+    fi
-+fi
-+AC_SUBST(USB_LIBS)
-+AC_SUBST(USB_CFLAGS)
-+dnl =======================================================
-+dnl FILE: ./kcontrol/joystick/configure.in.in
-+dnl =======================================================
-+
-+case "$host" in
-+  *-*-linux*)
-+	FOUND_LINUX=yes
-+	;;
-+esac
-+
-+AM_CONDITIONAL(include_kcontrol_joystick, test "$FOUND_LINUX" = "yes")
-+dnl =======================================================
-+dnl FILE: ./kcontrol/kfontinst/configure.in.in
-+dnl =======================================================
-+
-+FONTINST_SUBDIR=""
-+FONTINST_TN=""
-+
-+# Check for FreeType...
-+KFI_FOUND_FREETYPE=0
-+
-+KDE_FIND_PATH(freetype-config, FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
-+              AC_MSG_WARN([Could not find libfreetype anywhere, check http://www.freetype.org/])
-+             ])
-+
-+if test -n "$FREETYPE_CONFIG"; then
-+    vers=`$FREETYPE_CONFIG --version 2>/dev/null | sed -e 's/libfreetype //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+    if test -n "$vers" && test "$vers" -ge 9002003
-+    then
-+        LIBFREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
-+        LIBFREETYPE_RPATH=
-+        for args in $LIBFREETYPE_LIBS; do
-+            case $args in
-+                -L*)
-+                LIBFREETYPE_RPATH="$LIBFREETYPE_RPATH $args"
-+                ;;
-+            esac
-+        done
-+        LIBFREETYPE_RPATH=`echo $LIBFREETYPE_RPATH | sed -e "s/-L/-R/g"`
-+        LIBFREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
-+        KFI_FOUND_FREETYPE=1
-+    else
-+        AC_MSG_WARN([You need at least FreeType 2.1.3])
-+    fi
-+fi
-+
-+if test "$KFI_FOUND_FREETYPE" -eq 1; then
-+    AC_SUBST(LIBFREETYPE_LIBS)
-+    AC_SUBST(LIBFREETYPE_CFLAGS)
-+    AC_SUBST(LIBFREETYPE_RPATH)
-+
-+    KFI_FOUND_FONTCONFIG=0
-+    # check for fontconfig...
-+    KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
-+            KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
-+                AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ])
-+            ])
-+    ])
-+
-+    if test -n "$PKGCONFIG"; then
-+        vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+        if test -n "$vers" && test "$vers" -ge 2000000 ; then
-+            LIBFONTCONFIG_LIBS="`$PKGCONFIG fontconfig --libs`"
-+            LIBFONTCONFIG_RPATH=
-+            for args in $LIBFONTCONFIG_LIBS; do
-+                case $args in
-+                    -L*)
-+                        LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+                        ;;
-+                esac
-+            done
-+            LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | sed -e "s/-L/-R/g"`
-+            LIBFONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`"
-+            KFI_FOUND_FONTCONFIG=1
-+        fi
-+    fi
-+
-+    if test -n "$FONTCONFIG_CONFIG"; then
-+        vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+        if test -n "$vers" && test "$vers" -ge 2000000 ; then
-+            LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`"
-+            LIBFONTCONFIG_RPATH=
-+            for args in $LIBFONTCONFIG_LIBS; do
-+                case $args in
-+                    -L*)
-+                        LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+                        ;;
-+                esac
-+            done
-+            LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | sed -e "s/-L/-R/g"`
-+            LIBFONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`"
-+            KFI_FOUND_FONTCONFIG=1
-+        fi
-+    fi
-+
-+    if test "$KFI_FOUND_FONTCONFIG" -eq 1; then
-+        AC_SUBST(LIBFONTCONFIG_LIBS)
-+        AC_SUBST(LIBFONTCONFIG_CFLAGS)
-+        AC_SUBST(LIBFONTCONFIG_RPATH)
-+
-+        # Check OS...
-+        AC_MSG_CHECKING([OS])
-+        case "$host" in
-+            *-*-linux*) UNAME='Linux' ;;
-+            *-*-freebsd*) UNAME='FreeBSD' ;;
-+            *-*-kfreebsd-gnu*) UNAME='GNU/kFreeBSD' ;;
-+            *-*-netbsd*) UNAME='NetBSD' ;;
-+            *-*-solaris*) UNAME='Solaris' ;;
-+            *-*-irix*) UNAME='Irix' ;;
-+            *-*-aix*) UNAME='AIX' ;;
-+            *-*-hpux*) UNAME='HPUX' ;;
-+            *-*-darwin*) UNAME='Darwin' ;;
-+            *) UNAME='Unknown' ;;
-+            esac
-+                AC_MSG_RESULT($UNAME)
-+        AC_SUBST(UNAME)
-+
-+        # Check for fontenc...
-+        ac_font_enc_headers=0
-+        KDE_CHECK_HEADER(X11/fonts/fontenc.h,[ac_font_enc_headers=1])
-+        if test "$ac_font_enc_headers" = "0"; then
-+            AC_MSG_WARN(FontEnc headers not found. FontEnc support disabled)
-+        else
-+            ac_LDFLAGS_save="$LDFLAGS"
-+            ld_shared_flag=
-+            KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
-+            LDFLAGS="$LDFLAGS $ld_shared_flag $all_libraries -lz"
-+            KDE_CHECK_LIB(fontenc,FontEncDirectory,ac_font_enc_lib=1,ac_font_enc_lib=0)
-+            if test "$ac_font_enc_lib" = "1"; then
-+                LIB_FONT_ENC="-lfontenc"
-+                AC_DEFINE(HAVE_FONT_ENC, 1, [Defines if you have FontEnc])
-+            fi
-+            LDFLAGS="$ac_LDFLAGS_save"
-+        fi
-+        AC_SUBST(LIB_FONT_ENC)
-+
-+        FONTINST_SUBDIR="kfontinst"
-+        # Check for Xft...
-+        ac_xft_headers=0
-+        ac_CXXFLAGS_save="$CXXFLAGS"
-+        ac_CFLAGS_save="$CFLAGS"
-+        ac_CPPFLAGS_save="$CPPFLAGS"
-+        CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $LIBFREETYPE_CFLAGS"
-+        CFLAGS="$CXXFLAGS"
-+        CPPFLAGS="$CXXFLAGS"
-+        
-+        AC_CHECK_HEADER(X11/Xft/Xft.h, [ac_xft_headers=1])
-+        if test "$ac_xft_headers" -eq 1 ; then
-+            LIBXFT_LIB=-lXft
-+            AC_SUBST(LIBXFT_LIB)
-+        else
-+            AC_MSG_WARN([Missing Xft headers - disabling font previews!])
-+        fi
-+        CXXFLAGS="$ac_CXXFLAGS_save"
-+        CFLAGS="$ac_CFLAGS_save"
-+        CPPFLAGS="$ac_CPPFLAGS_save"
-+    else
-+        AC_MSG_WARN([Missing FontConfig - disabling kfontinst!])
-+    fi
-+else
-+    AC_MSG_WARN([Missing FreeType2 - disabling kfontinst!])
-+fi
-+
-+AM_CONDITIONAL(include_fontinst_tn, test "$ac_xft_headers" -eq 1)
-+
-+if test "$ac_xft_headers" -eq 1 ; then
-+    AC_DEFINE(HAVE_XFT, 1, [Defines if you have Xft])
-+fi
-+
-+AM_CONDITIONAL(include_kcontrol_kfontinst, test -n "$FONTINST_SUBDIR")
-+dnl =======================================================
-+dnl FILE: ./kcontrol/nics/configure.in.in
-+dnl =======================================================
-+
-+AC_CHECK_FUNCS(getifaddrs getnameinfo)
-+AC_CHECK_MEMBERS([struct sockaddr.sa_len],,,[
-+#include <sys/types.h>
-+#include <sys/socket.h>])
-+dnl =======================================================
-+dnl FILE: ./kcontrol/randr/configure.in.in
-+dnl =======================================================
-+
-+dnl -----------------------------------------------------
-+dnl X Resize and Rotate extension library check
-+dnl -----------------------------------------------------
-+
-+KDE_CHECK_HEADERS(X11/extensions/Xrandr.h, [xrandr_h=yes], [xrandr_h=no], [#include <X11/Xlib.h>])
-+if test "$xrandr_h" = yes; then
-+  KDE_CHECK_LIB(Xrandr, XRRSetScreenConfigAndRate, [
-+    LIB_XRANDR=-lXrandr
-+    AC_DEFINE_UNQUOTED(XRANDR_SUPPORT, 1, [Defined if your system has XRandR support])
-+    RANDR_SUBDIR="randr"
-+  ], [
-+    RANDR_SUBDIR=""
-+  ], -lXrender -lXext $X_EXTRA_LIBS)
-+else
-+  LIB_XRANDR=
-+fi
-+AC_SUBST(LIB_XRANDR)
-+AM_CONDITIONAL(include_kcontrol_randr, test -n "$RANDR_SUBDIR")
-+dnl =======================================================
-+dnl FILE: ./kcontrol/screensaver/configure.in.in
-+dnl =======================================================
-+
-+AC_HAVE_GL(
-+    [
-+    AC_CHECK_LIB(GL,glXChooseVisual,
-+        [
-+        AC_DEFINE(HAVE_GLXCHOOSEVISUAL, 1, [Define if you have glXChooseVisual()])
-+        ])
-+    ],[]
-+    )
-+dnl =======================================================
-+dnl FILE: ./kcontrol/smartcard/configure.in.in
-+dnl =======================================================
-+
-+
-+KDE_CHECK_HEADER(kcarddb.h, FOUND_KSMCARD="yes", FOUND_KSMCARD="no")
-+AM_CONDITIONAL(include_kcontrol_smartcard, test "$FOUND_KSMCARD" = "yes")
-+dnl =======================================================
-+dnl FILE: ./kcontrol/usbview/configure.in.in
-+dnl =======================================================
-+
-+case "$host" in
-+  *-*-linux*|*-*-freebsd*|*-*-kfreebsd*-gnu)
-+	FOUND_USBVIEW=yes
-+	;;
-+esac
-+
-+AM_CONDITIONAL(include_kcontrol_usbview, test "$FOUND_USBVIEW" = "yes")
-+
-+AC_ARG_WITH([usbids], AC_HELP_STRING([--with-usbids=PATH], [Use the usb.ids file at the specified path, instead of the local copy]))
-+
-+if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then
-+  AC_DEFINE_UNQUOTED(USBIDS_FILE, "$with_usbids", [Path for the usb.ids file to use])
-+  dont_install_usbids="yes"
-+fi
-+
-+AM_CONDITIONAL(install_usbids, test "x$dont_install_usbids" != "xyes")
-+dnl =======================================================
-+dnl FILE: ./kcontrol/view1394/configure.in.in
-+dnl =======================================================
-+
-+AC_ARG_WITH(libraw1394,
-+  [AC_HELP_STRING(--with-libraw1394,
-+    [enable visualization of ieee1394 devices through libraw1394 @<:@default=check@:>@])],
-+  [], with_libraw1394=check)
-+
-+VIEW1394_SUBDIR=
-+if test "x$with_libraw1394" != xno; then
-+  KDE_CHECK_HEADER(libraw1394/raw1394.h, VIEW1394_SUBDIR=view1394)
-+
-+  if test "x$with_libraw1394" != xcheck && test -z "$VIEW1394_SUBDIR"; then
-+    AC_MSG_ERROR([--with-libraw1394 was given, but test for libraw1394 failed])
-+  fi
-+fi
-+
-+AM_CONDITIONAL(include_kcontrol_view1394, test -n "$VIEW1394_SUBDIR")
-+dnl =======================================================
-+dnl FILE: ./kdeprint/configure.in.in
-+dnl =======================================================
-+
-+dnl nothing special
-+dnl =======================================================
-+dnl FILE: ./kdeprint/kprinter/configure.in.in
-+dnl =======================================================
-+
-+AC_CHECK_FUNCS(sigset sigaction)
-+dnl =======================================================
-+dnl FILE: ./kdesktop/configure.in.in
-+dnl =======================================================
-+
-+xss_save_ldflags="$LDFLAGS"
-+LDFLAGS="$X_LDFLAGS"
-+
-+LIB_XSS=
-+
-+AC_ARG_WITH([xscreensaver],
-+  AC_HELP_STRING([--without-xscreensaver], [Disable XScreenSaver support (default: check)]) )
-+
-+if test "x$with_xscreensaver" != "xno"; then
-+  KDE_CHECK_HEADER(X11/extensions/scrnsaver.h,
-+    [
-+    AC_CHECK_LIB(Xext,XScreenSaverQueryInfo,
-+	[
-+        AC_DEFINE(HAVE_XSCREENSAVER, 1, [Define if you have the XScreenSaver extension])
-+	LIB_XSS="-lXext"
-+        ],
-+        [
-+        ld_shared_flag=
-+        xss_save_cxxflags="$CXXFLAGS"
-+        CXXFLAGS="$CXXFLAGS $lt_prog_compiler_pic_CXX"
-+        KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
-+        AC_CHECK_LIB(Xss,XScreenSaverQueryInfo,
-+            [
-+            AC_DEFINE(HAVE_XSCREENSAVER, 1, [Define if you have the XScreenSaver extension])
-+            LIB_XSS="-lXss"
-+            ],
-+            [],
-+            [ $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
-+        CXXFLAGS="$xss_save_cxxflags"
-+        ],
-+        [ $X_PRE_LIBS -lX11 $X_EXTRA_LIBS ])
-+     ], [],
-+     [
-+     #include <X11/Xlib.h>
-+     ] )
-+fi
-+
-+AC_SUBST(LIB_XSS)
-+LDFLAGS="$xss_save_ldflags"
-+dnl =======================================================
-+dnl FILE: ./kdesktop/lock/configure.in.in
-+dnl =======================================================
-+
-+xss_save_ldflags="$LDFLAGS"
-+LDFLAGS="$X_LDFLAGS"
-+
-+LIB_XF86MISC=
-+
-+KDE_CHECK_HEADER(X11/extensions/xf86misc.h,
-+    [
-+    AC_CHECK_LIB(Xxf86misc,XF86MiscQueryVersion,
-+	[
-+        AC_DEFINE(HAVE_XF86MISC, 1, [Define if you have the xf86misc extension])
-+	LIB_XF86MISC="-lXxf86misc"
-+        ],
-+        [], [ $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
-+    ],[],
-+    [
-+    #include <X11/Xlib.h>
-+    ])
-+AC_SUBST(LIB_XF86MISC)
-+
-+if test -n "$LIB_XF86MISC"; then
-+    AC_CHECK_LIB(Xxf86misc,XF86MiscSetGrabKeysState,
-+	[
-+        AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE, 1, [Define if you have XF86MiscSetGrabKeysState()])
-+        ],
-+        [], [ $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
-+fi
-+
-+LDFLAGS="$xss_save_ldflags"
-+
-+AC_HAVE_GL(
-+    [
-+    AC_CHECK_LIB(GL,glXChooseVisual,
-+        [
-+        AC_DEFINE(HAVE_GLXCHOOSEVISUAL, 1, [Define if you have glXChooseVisual()])
-+        ])
-+    ],[]
-+    )
-+dnl =======================================================
-+dnl FILE: ./kdesu/configure.in.in
-+dnl =======================================================
-+
-+dnl Check for "struct ucred"
-+AC_MSG_CHECKING("struct ucred")
-+AC_EGREP_HEADER([struct ucred], [sys/socket.h], have_ucred=yes)
-+if test "$have_ucred" = "yes"; then
-+    AC_DEFINE(HAVE_STRUCT_UCRED, 1, [Define if you have the struct ucred])
-+    AC_MSG_RESULT(yes)
-+else
-+    AC_MSG_RESULT(no)
-+fi
-+
-+dnl Check for the group "nogroup" or "nobody" Use -2 otherwise.
-+AC_MSG_CHECKING(nogroup)
-+AC_TRY_RUN([
-+    #include <grp.h>
-+    #include <sys/types.h>
-+
-+    int main() 
-+    {
-+	struct group *grp = getgrnam("nogroup");
-+	if (grp) return 0;
-+	return 1;
-+    }
-+], nogroup=nogroup, 
-+AC_TRY_RUN([
-+    #include <grp.h>
-+    #include <sys/types.h>
-+
-+    int main() 
-+    {
-+	struct group *grp = getgrnam("nobody");
-+	if (grp) return 0;
-+	return 1;
-+    }
-+], nogroup=nobody, 
-+nogroup=65534, nogroup=65534), nogroup=65534)
-+AC_MSG_RESULT($nogroup)
-+AC_SUBST(nogroup)
-+AC_CHECK_FUNCS(getpeereid)
-+
-+AC_ARG_WITH(sudo-kdesu-backend,
-+	    AC_HELP_STRING([--with-sudo-kdesu-backend],
-+			   [use sudo as backend for kdesu (default is su)]),
-+[
-+    if test x$withval = xyes; then
-+        use_kdesu_backend="sudo"
-+    else
-+        use_kdesu_backend="su"
-+    fi
-+],
-+    use_kdesu_backend="su"
-+)
-+
-+AC_DEFINE_UNQUOTED(DEFAULT_SUPER_USER_COMMAND, "$use_kdesu_backend", [Use su or sudo])
-+dnl =======================================================
-+dnl FILE: ./kdm/configure.in.in
-+dnl =======================================================
-+
-+KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])
-+
-+dnl ask imake about various X settings
-+AC_MSG_CHECKING([X paths])
-+imkv=8
-+test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
-+AC_CACHE_VAL(kde_cv_defines_imake, [
-+  rm -fr conftestdir
-+  if mkdir conftestdir; then
-+    cd conftestdir
-+    cat > Imakefile <<'EOF'[
-+
-+acimake:
-+	@echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\""
-+
-+]EOF
-+    if $XMKMF >&5 2>&1 && test -f Makefile; then
-+	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
-+	kde_cv_defines_imake_version=$imkv
-+    else
-+        AC_MSG_RESULT([failed])
-+	AC_MSG_ERROR([$XMKMF (imake) failed.
-+Make sure you have all necessary X development packages installed.
-+On some systems a missing /lib/cpp symlink is at fault.])
-+    fi
-+    cd ..
-+    rm -fr conftestdir
-+  else
-+    AC_MSG_RESULT([failed])
-+    AC_MSG_ERROR([cannot create temporary directory])
-+  fi
-+])
-+AC_MSG_RESULT([done])
-+eval "$kde_cv_defines_imake"
-+AC_DEFINE_UNQUOTED(XBINDIR, "$XBINDIR", [X binaries directory])
-+AC_DEFINE_UNQUOTED(XLIBDIR, "$XLIBDIR", [X libraries directory])
-+
-+if test -f /etc/ttys; then
-+  AC_DEFINE(BSD_INIT, 1, [Define if the system uses a BSD-style init])
-+fi
-+
-+AC_CHECK_FUNCS([getttyent])
-+case $host_os in
-+	linux*) ac_cv_func_getutxent=no;;
-+	darwin*) ac_cv_func_getutxent=no;;
-+	kfreebsd*-gnu) ac_cv_func_getutxent=no;;
-+	*) AC_CHECK_FUNC([getutxent]);;
-+esac
-+if test $ac_cv_func_getutxent = yes; then
-+	AC_DEFINE(HAVE_UTMPX, 1, [Define if the system uses extended utmp])
-+else
-+	AC_CHECK_FUNC([getutent], ,
-+		[AC_DEFINE(BSD_UTMP, 1, [Define if the system has no getutent])])
-+fi
-+
-+AC_CHECK_MEMBERS([struct utmp.ut_user], , , [#include <utmp.h>])
-+AC_CHECK_MEMBERS([struct passwd.pw_expire], , , [#include <pwd.h>])
-+AC_CHECK_MEMBERS([struct sockaddr_in.sin_len], , , [
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+])
-+
-+ac_save_libs=$LIBS
-+LIBS="$LIBS $LIBUTIL"
-+AC_CHECK_FUNCS([setlogin setusercontext getusershell login_getclass auth_timeok])
-+LIBS=$ac_save_libs
-+
-+dnl is getifaddrs always available without additional libs?
-+AC_CHECK_FUNCS([mkstemp setproctitle sysinfo strnlen getifaddrs])
-+
-+AC_CHECK_FUNCS([arc4random], ,
-+	[
-+dnl assume that /dev/random is non-blocking if /dev/urandom does not exist
-+for i in urandom random; do
-+  if test -c /dev/$i; then
-+    AC_DEFINE_UNQUOTED(DEV_RANDOM, "/dev/$i", [Define the system's entropy device])
-+    break
-+  fi
-+done
-+	])
-+
-+AC_CHECK_FUNC(vsyslog, [
-+  AC_DEFINE(USE_SYSLOG, 1, [Define if kdm should be built with syslog support])])
-+
-+kdm_no_Xau=false
-+kdm_no_Xdmcp=false
-+
-+AC_CHECK_LIB(Xau, main, [:], 
-+	[
-+	  kdm_no_Xau=true
-+	  DO_NOT_COMPILE="$DO_NOT_COMPILE kdm"
-+	], 
-+	  $X_LDFLAGS -lX11 $LIBSOCKET)
-+
-+AC_ARG_WITH(xdmcp,
-+        AC_HELP_STRING([--without-xdmcp],[build kdm without xdmcp support [default=with xdmcp]]), ,
-+	[with_xdmcp=yes])
-+if test "x$with_xdmcp" = xyes; then
-+  AC_CHECK_LIB(Xdmcp, main, [LIBXDMCP="-lXdmcp"], , $X_LDFLAGS -lX11 $LIBSOCKET)
-+  if test -n "$LIBXDMCP"; then
-+    cppflags_safe=$CPPFLAGS
-+    CPPFLAGS="$CPPFLAGS $X_INCLUDES"
-+    AC_CHECK_HEADER(X11/Xdmcp.h, [HAVE_X11_XDMCP_H=1], , [#include <X11/Xmd.h>])
-+    CPPFLAGS=$cppflags_safe
-+  fi
-+  if test -z "$HAVE_X11_XDMCP_H"; then
-+    kdm_no_Xdmcp=true
-+    DO_NOT_COMPILE="$DO_NOT_COMPILE kdm"
-+  fi
-+  AC_DEFINE(XDMCP, 1, [Define if kdm should be built with XDMCP support])
-+  ac_save_libs=$LIBS
-+  LIBS="$LIBS $LIBXDMCP"
-+  AC_CHECK_FUNC(XdmcpWrap, [
-+    AC_DEFINE(HASXDMAUTH, 1, [Define if kdm should be built with XDMAUTH support])
-+  ])
-+  LIBS=$ac_save_libs
-+fi
-+AC_SUBST(LIBXDMCP)
-+
-+KRB4_INCS=
-+KRB4_LIBS=
-+KRB4_RPATH=
-+
-+AC_MSG_CHECKING(whether to use Kerberos v4)
-+AC_ARG_WITH(krb4,
-+AC_HELP_STRING([--with-krb4=PATH],[Compile in Kerberos v4 support]),
-+[ test "x$with_krb4" = xyes && with_krb4=/usr/kerberos ],
-+[ with_krb4=no ]
-+)
-+case "$with_krb4" in
-+no)
-+  AC_MSG_RESULT(no)
-+  ;;
-+*)
-+  AC_MSG_RESULT(yes)
-+  AC_DEFINE_UNQUOTED(KRB4, 1, [define if you have Kerberos IV])
-+  KRB4_INCS="-I$with_krb4/include"
-+  KRB4_LIBS="-L$with_krb4/lib -lkrb -ldes"
-+  if test "$USE_RPATH" = "yes" ; then
-+    KRB4_RPATH="-R $with_krb4/lib"
-+  fi
-+  AC_CHECK_LIB(resolv, dn_expand, KRB4_LIBS="$KRB4_LIBS -lresolv")
-+  ;;
-+esac
-+
-+AC_MSG_CHECKING(whether to use AFS)
-+AC_ARG_WITH(afs,
-+  AC_HELP_STRING([--with-afs],[Compile in AFS support (requires KTH krb4)]), , 
-+  [ with_afs=no ])
-+if test "$with_afs" = no; then
-+  AC_MSG_RESULT(no)
-+else
-+  if test "$with_krb4" = no; then
-+    AC_MSG_RESULT(no)
-+    AC_MSG_WARN("AFS requires Kerberos v4 support.")
-+    with_afs=no
-+  else
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE_UNQUOTED(AFS, 1, [define if you have KTH Kerberos IV and AFS])
-+    KRB4_LIBS="$KRB4_LIBS -lkafs"
-+    if test -n "$os_aix"; then
-+      KRB4_LIBS="$KRB4_LIBS -lld"
-+    fi
-+  fi
-+fi
-+
-+AC_SUBST(KRB4_INCS)
-+AC_SUBST(KRB4_LIBS)
-+AC_SUBST(KRB4_RPATH)
-+
-+AC_CHECK_LIB(s, main, [LIB_LIBS="-ls"]) dnl for AIX
-+AC_SUBST(LIB_LIBS)
-+
-+AC_CHECK_LIB(posix4, sched_yield, [LIBPOSIX4=-lposix4])
-+AC_SUBST(LIBPOSIX4)
-+
-+KRB5_INCS=
-+KRB5_LIBS=
-+KRB5_RPATH=
-+
-+AC_MSG_CHECKING([whether to use Kerberos5 for Xauth cookies in kdm])
-+AC_ARG_WITH(krb5auth,
-+  AC_HELP_STRING([--with-krb5auth=PATH],[Use Kerberos5 for Xauth cookies in kdm]), ,
-+  [ with_krb5auth=no ])
-+if test "x$with_krb5auth" = xno; then
-+  AC_MSG_RESULT(no)
-+else
-+  AC_MSG_RESULT(yes)
-+  if test "x$with_krb5auth" != xyes; then
-+    KRB5_INCS="-I$with_krb5auth/include"
-+    KRB5_LIBS="-L$with_krb5auth/lib"
-+    if test "$USE_RPATH" = "yes" ; then
-+      KRB5_RPATH="-R $with_krb5auth/lib"
-+    fi
-+  fi
-+  KRB5_LIBS="$KRB5_LIBS -lkrb5" dnl -lk5crypto -lcom_err -lresolv
-+  keepcflags=$CFLAGS
-+  CFLAGS="$KRB5_INCS $CFLAGS"
-+  AC_CHECK_HEADER(krb5/krb5.h, 
-+    [ AC_DEFINE(K5AUTH, 1, [Define if kdm should use Kerberos 5 for Xauth cookies.]) ],
-+    [ AC_MSG_ERROR([--with-krb5auth requires Kerberos5 header files.
-+Due to a problem with X includes you probably have to run "ln -s . krb5"
-+in the directory where the krb5.h include resides to make things actually work.])])
-+  CFLAGS="$keepcflags"
-+fi
-+
-+AC_SUBST(KRB5_INCS)
-+AC_SUBST(KRB5_LIBS)
-+AC_SUBST(KRB5_RPATH)
-+
-+AC_MSG_CHECKING([whether to use Sun's secure RPC for Xauth cookies in kdm])
-+AC_ARG_WITH(rpcauth,
-+  AC_HELP_STRING([--with-rpcauth],[Use Sun's secure RPC for Xauth cookies in kdm.]), , 
-+  [ with_rpcauth=no ])
-+if test "x$with_rpcauth" = xno; then
-+  AC_MSG_RESULT(no)
-+else
-+  AC_MSG_RESULT(yes)
-+  AC_CHECK_HEADER(rpc/rpc.h, 
-+    [ AC_DEFINE(SECURE_RPC, 1, [Define if kdm should use Sun's secure RPC for Xauth cookies.]) ],
-+    [ AC_MSG_ERROR([--with-rpcauth requires Sun RPC header files.])])
-+fi
-+
-+if test "x$use_pam" = xyes; then
-+    AC_DEFINE(USE_PAM, 1, [Define if kdm should use PAM])
-+elif test "x$use_shadow" = xyes; then
-+    AC_DEFINE(USESHADOW, 1, [Define if kdm should use shadow passwords])
-+fi
-+if test "x$with_krb4" != xno; then
-+    AC_DEFINE(KERBEROS, 1, [Define if kdm should use Kerberos IV])
-+    if test "x$with_afs" = xno; then
-+        AC_DEFINE(NO_AFS, 1, [Define if kdm should not use AFS])
-+    fi
-+fi
-+
-+AC_ARG_WITH(kdm-xconsole,
-+	AC_HELP_STRING([--with-kdm-xconsole],[build kdm with built-in xconsole [default=no]]), ,
-+	[with_kdm_xconsole=no])
-+if test "x$with_kdm_xconsole" = xyes; then
-+    AC_DEFINE(WITH_KDM_XCONSOLE, 1, [Build kdm with built-in xconsole])
-+fi
-+
-+dnl AC_OUTPUT(kdm/kfrontend/sessions/kde.desktop)
-+dnl =======================================================
-+dnl FILE: ./khelpcenter/configure.in.in
-+dnl =======================================================
-+
-+dnl AC_OUTPUT(khelpcenter/searchhandlers/khc_docbookdig.pl)
-+dnl AC_OUTPUT(khelpcenter/searchhandlers/khc_htdig.pl)
-+dnl =======================================================
-+dnl FILE: ./khotkeys/configure.in.in
-+dnl =======================================================
-+
-+dnl ---------------------------------------------------------------------------
-+dnl check if compiler compiles correctly something like this :
-+dnl class A { virtual A* me(); };
-+dnl class X {};
-+dnl class B : public X, public A { virtual B* me(); };
-+dnl stupid gcc doesn't even bother to warn it can't do it correctly
-+dnl ---------------------------------------------------------------------------
-+
-+AC_MSG_CHECKING(if covariant return works)
-+AC_CACHE_VAL(kde_cv_covariant_return,
-+    [
-+    kde_cv_covariant_return=no
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    AC_TRY_RUN( 
-+        [
-+        class A { public: virtual A* me(); };
-+        class X { public: int x; virtual void ff() {}; };
-+        class B : public X, public A { public: virtual B* me(); };
-+        int foo( A* a )
-+            {
-+            A* aa = a->me();
-+            return a == aa;
-+            }
-+        int main()
-+            {
-+            B* b = new B;
-+            return foo( b ) == 0;
-+            }
-+        A* A::me() { return this; }
-+        B* B::me() { return this; }
-+        ],
-+        [ kde_cv_covariant_return=yes ])
-+    AC_LANG_RESTORE
-+    ])
-+
-+if test "$kde_cv_covariant_return" = "no"; then
-+    AC_MSG_RESULT(no)
-+    AC_DEFINE(COVARIANT_RETURN_BROKEN, 1,
-+        [Define if covariant return in virtual methods works])
-+else
-+    AC_MSG_RESULT(yes)
-+fi
-+
-+
-+dnl ---------------------------------------------------------------------------
-+dnl check for arts for speech recognition
-+dnl ---------------------------------------------------------------------------
-+
-+
-+artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
-+AC_PATH_PROG(ARTSCCONFIG, artsc-config, no, $artsc_config_test_path)
-+
-+if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
-+	LIB_ARTS="-lartskde"
-+	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
-+	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
-+	AC_DEFINE(HAVE_ARTS, 1, [Defined for arts support in khotkeys])
-+        KHOTKEYS_ARTS_SUBDIR=arts
-+else
-+	LIB_ARTS=""
-+	ARTS_CFLAGS=""
-+        KHOTKEYS_ARTS_SUBDIR=
-+fi
-+
-+AC_SUBST(LIB_ARTS)
-+AC_SUBST(ARTS_CFLAGS)
-+AC_SUBST(KHOTKEYS_ARTS_SUBDIR)
-+dnl =======================================================
-+dnl FILE: ./kicker/applets/naughty/configure.in.in
-+dnl =======================================================
-+
-+case "$host" in
-+  *-*-freebsd*) LIB_KVM="-lkvm" ;;
-+  *) LIB_KVM=""  ;;
-+esac
-+AC_SUBST(LIB_KVM)
-+dnl =======================================================
-+dnl FILE: ./kicker/extensions/kasbar/configure.in.in
-+dnl =======================================================
-+
-+AC_CHECK_HEADERS(sys/loadavg.h)
-+dnl =======================================================
-+dnl FILE: ./kicker/taskmanager/configure.in.in
-+dnl =======================================================
-+
-+if test "x$with_composite" != "xno"; then
-+  dnl XComposite check
-+  KDE_CHECK_HEADER(X11/extensions/Xcomposite.h, [xcomposite_h=yes], [xcomposite_h=no], [#include <X11/Xlib.h>])
-+  if test "$xcomposite_h" = yes; then
-+    KDE_CHECK_LIB(Xcomposite, XCompositeQueryExtension, [
-+      LIB_XCOMPOSITE=-lXcomposite
-+      AC_DEFINE_UNQUOTED(HAVE_XCOMPOSITE, 1, [Define if you have the XComposite extension])
-+    ], [], -lXext -lX11 $X_EXTRA_LIBS)
-+  else
-+    LIB_XCOMPOSITE=
-+  fi
-+  AC_SUBST(LIB_XCOMPOSITE)
-+fi
-+
-+dnl XFixes check
-+KDE_CHECK_HEADER(X11/extensions/Xfixes.h, [xfixes_h=yes], [xfixes_h=no], [#include <X11/Xlib.h>])
-+if test "$xfixes_h" = yes; then
-+  KDE_CHECK_LIB(Xfixes, XFixesQueryExtension, [
-+    LIB_XFIXES=-lXfixes
-+    AC_DEFINE_UNQUOTED(HAVE_XFIXES, 1, [Define if you have the XFixes extension])
-+  ], [], -lXext -lX11 $X_EXTRA_LIBS)
-+else
-+  LIB_XFIXES=
-+fi
-+AC_SUBST(LIB_XFIXES)
-+dnl =======================================================
-+dnl FILE: ./kioslave/configure.in.in
-+dnl =======================================================
-+
-+KDE_CHECK_SSL
-+
-+sasl2_header="no"
-+SASL2_LIBS=""
-+
-+KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for kio_ldap
-+KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
-+if test "$sasl2_header" = "yes" ; then
-+  KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2")
-+fi
-+
-+if test "x$SASL2_LIBS" != "x" ; then
-+  AC_DEFINE_UNQUOTED(HAVE_LIBSASL2, 1, [Define if you have cyrus-sasl2 libraries])
-+fi
-+AC_SUBST(SASL2_LIBS)
-+dnl =======================================================
-+dnl FILE: ./kioslave/filter/configure.in.in
-+dnl =======================================================
-+
-+AC_FIND_BZIP2
-+dnl =======================================================
-+dnl FILE: ./kioslave/fish/configure.in.in
-+dnl =======================================================
-+
-+CFLAGS="$CFLAGS -D_GNU_SOURCE"
-+CXXFLAGS="$CXXFLAGS -D_GNU_SOURCE"
-+
-+AC_CHECK_HEADERS(termios.h pty.h libutil.h util.h sys/types.h sys/ioctl.h stropts.h)
-+
-+kde_save_LIBS="$LIBS"
-+LIBS="$LIBS $LIBUTIL"
-+AC_CHECK_FUNCS(getpt openpty isastream)
-+LIBS="$kde_save_LIBS"
-+dnl =======================================================
-+dnl FILE: ./kioslave/ldap/configure.in.in
-+dnl =======================================================
-+
-+AC_MSG_CHECKING(for LDAP support)
-+AC_ARG_WITH(ldap,
-+AC_HELP_STRING([--with-ldap=PATH],[Set path for LDAP files [default=check]]),
-+[ case "$withval" in
-+  yes)
-+    with_ldap=CHECK
-+    ;;
-+  esac ],
-+[ with_ldap=CHECK ]
-+)dnl
-+
-+if test "x$with_ldap" = "xCHECK" ; then
-+  with_ldap=NOTFOUND
-+  search_incs="$kde_includes /usr/include /usr/local/include"
-+  AC_FIND_FILE(ldap.h, $search_incs, ldap_incdir)
-+  if test -r $ldap_incdir/ldap.h ; then
-+    test "x$ldap_incdir" != "x/usr/include" && LDAP_INCS="-I$ldap_incdir"
-+    with_ldap=FOUND
-+  fi
-+  if test $with_ldap = FOUND ; then
-+    with_ldap=NOTFOUND
-+    for ext in la so sl a dylib ; do
-+      AC_FIND_FILE(libldap.$ext, $kde_libraries /usr/lib /usr/local/lib /usr/lib64,
-+        ldap_libdir)
-+      if test -r $ldap_libdir/libldap.$ext ; then
-+        if test "x$ldap_libdir" != "x/usr/lib" ; then
-+          LDAP_LIBS="-L$ldap_libdir "
-+          test "$USE_RPATH" = yes && LDAP_RPATH="-R $ldap_libdir"
-+        fi
-+        LDAP_LIBS="${LDAP_LIBS}-lldap"
-+        with_ldap=FOUND
-+        break
-+      fi
-+    done
-+  fi
-+fi
-+
-+case "$with_ldap" in
-+no) AC_MSG_RESULT(no) ;;
-+framework)
-+  LDAP_LIBS="-Xlinker -framework -Xlinker LDAP"
-+  AC_DEFINE_UNQUOTED(HAVE_LIBLDAP, 1, [Define if you have LDAP libraries])
-+  LDAP_SUBDIR="ldap"
-+  AC_MSG_RESULT(Apple framework)
-+  ;;
-+FOUND)
-+  AC_MSG_RESULT(incs=$ldap_incdir libs=$ldap_libdir)
-+  ;;
-+NOTFOUND) AC_MSG_RESULT(searched but not found) ;;
-+*)
-+  AC_MSG_RESULT($with_ldap)
-+  ;;
-+esac
-+
-+LIB_LBER=
-+KDE_CHECK_LIB(lber, ber_alloc, [LIB_LBER=-llber], [], -L$ldap_libdir)
-+AC_SUBST(LIB_LBER)
-+
-+AC_MSG_CHECKING(whether LDAP support can be compiled)
-+
-+  if test "x$with_ldap" != "xFOUND" ; then
-+    LDAP_ROOT="$with_ldap"
-+    if test "x$LDAP_ROOT" != "x/usr" ; then
-+      LDAP_INCS="-I${LDAP_ROOT}/include"
-+      LDAP_LIBS="-L${LDAP_ROOT}/lib "
-+      if test "$USE_RPATH" = "yes" ; then
-+        LDAP_RPATH="-R ${LDAP_ROOT}/lib"
-+      fi
-+    fi
-+    LDAP_LIBS="${LDAP_LIBS}-lldap"
-+  fi
-+  LDAP_LIBS="${LDAP_LIBS} ${LIB_LBER} ${LIBRESOLV}"
-+
-+  kde_safe_LIBS="$LIBS"
-+  kde_safe_CFLAGS="$CFLAGS"
-+  LIBS="$LIBS $all_libraries $LDAP_LIBS $KRB4_LIBS $X_EXTRA_LIBS"
-+  CFLAGS="$CFLAGS $all_includes $LDAP_INCS $KRB4_INCS"
-+  AC_LANG_SAVE
-+  AC_LANG_C
-+  AC_TRY_LINK(dnl
-+  [
-+  #include <ldap.h>
-+  #if LDAP_API_VERSION < 2004
-+  #error LDAP version too old, please upgrade to a library supporting API 2004 or higher
-+  #endif
-+  ],
-+  [
-+  LDAP *ldap;
-+  ],
-+  , with_ldap=no
-+  )
-+  AC_LANG_RESTORE
-+  CFLAGS=$kde_safe_CFLAGS
-+  LIBS=$kde_safe_LIBS
-+  if test "$with_ldap" = "no" ; then
-+    LDAP_INCS=
-+    LDAP_LIBS=
-+    LDAP_RPATH=
-+    LDAP_SUBDIR=
-+    AC_MSG_RESULT(no (but first try gave $msg))
-+  else
-+    AC_DEFINE_UNQUOTED(HAVE_LIBLDAP, 1, [Define if you have LDAP libraries])
-+    LDAP_SUBDIR="ldap"
-+    AC_MSG_RESULT(yes)
-+  fi
-+
-+AC_SUBST(LDAP_INCS)
-+AC_SUBST(LDAP_LIBS)
-+AC_SUBST(LDAP_RPATH)
-+
-+AM_CONDITIONAL(include_kioslave_ldap, test -n "$LDAP_SUBDIR")
-+dnl =======================================================
-+dnl FILE: ./kioslave/media/configure.in.in
-+dnl =======================================================
-+
-+########### Check for linux/cdrom.h
-+
-+AC_CHECK_HEADER(linux/cdrom.h,
-+[
-+  AC_DEFINE_UNQUOTED([COMPILE_LINUXCDPOLLING], 1, [media linux cd polling compilation])
-+  LINUXCDPOLLING=yes
-+  AC_SUBST(LINUXCDPOLLING)
-+])
-+
-+
-+AC_ARG_WITH(hal,AC_HELP_STRING([--with-hal],[Enable HAL support  [default=check]]),[hal_test="$withval"],[hal_test="yes"])
-+
-+if test "x$hal_test" = "xyes" ; then
-+
-+########### Check for the HAL
-+  AC_MSG_CHECKING(for the HAL)
-+
-+  hal_inc=NOTFOUND
-+  hal_lib=NOTFOUND
-+  hal=NOTFOUND
-+
-+  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/hal /usr/local/include /usr/local/include/hal"
-+  AC_FIND_FILE(libhal.h libhal-storage.h, $search_incs, hal_incdir)
-+
-+  if test -r $hal_incdir/libhal.h && test -r $hal_incdir/libhal-storage.h && grep LibHalVolume $hal_incdir/libhal-storage.h > /dev/null 2>&1; then
-+    HAL_INCS="-I$hal_incdir"
-+    hal_inc=FOUND
-+  fi
-+
-+  search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff"
-+  AC_FIND_FILE(libhal.so libhal-storage.so, $search_libs, hal_libdir)
-+
-+  if test -r $hal_libdir/libhal.so && test -r $hal_libdir/libhal-storage.so ; then
-+    HAL_LIBS="-L$hal_libdir -lhal -lhal-storage"
-+    hal_lib=FOUND
-+  fi
-+
-+  if test "$hal_inc" != FOUND || test "$hal_lib" != FOUND; then 
-+    KDE_PKG_CHECK_MODULES( HAL, hal > 0.5, [ HAL_INCS=$HAL_CFLAGS; hal_inc=FOUND; hal_lib=FOUND; ] , AC_MSG_RESULT(Nothing found on PKG_CONFIG_PATH) )
-+  fi
-+
-+  if test "$hal_inc" = FOUND && test "$hal_lib" = FOUND ; then
-+      AC_MSG_RESULT(headers $HAL_INCS  libraries $HAL_LIBS)
-+      hal=FOUND
-+  else
-+      AC_MSG_RESULT(searched but not found)
-+  fi
-+
-+
-+  AC_SUBST(HAL_INCS)
-+  AC_SUBST(HAL_LIBS)
-+
-+
-+########### Check for DBus
-+
-+  AC_MSG_CHECKING(for DBus)
-+
-+  dbus_inc=NOTFOUND
-+  dbus_lib=NOTFOUND
-+  dbus=NOTFOUND
-+
-+  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-+  AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir)
-+
-+  search_incs_arch_deps="$kde_includes $kde_extra_includes /usr/lib$kdelibsuff/dbus-1.0/include /usr/local/lib$kdelibsuff/dbus-1.0/include"
-+  AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps)
-+
-+  if test -r $dbus_incdir/dbus/dbus.h && test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h ; then
-+    DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps"
-+    dbus_inc=FOUND
-+  fi
-+
-+  search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff"
-+  AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)
-+
-+  if test -r $dbus_libdir/libdbus-1.so ; then
-+    DBUS_LIBS="-L$dbus_libdir -ldbus-1"
-+    dbus_lib=FOUND
-+  fi
-+
-+  if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then 
-+    KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) )
-+  fi
-+
-+  dbus_bus_var=`pkg-config --variable=system_bus_default_address dbus-1 2>/dev/null`
-+  if test -z "$dbus_bus_var"; then
-+        dbus_bus_var="unix:path=/var/run/dbus/system_bus_socket"
-+  fi
-+  AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS, "$dbus_bus_var", [Define the unix domain path for dbus system bus])
-+
-+  if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
-+    AC_MSG_RESULT(headers $DBUS_INCS libraries $DBUS_LIBS)
-+    dbus=FOUND
-+  else
-+    AC_MSG_RESULT(searched but not found)
-+  fi
-+
-+  AC_SUBST(DBUS_INCS)
-+  AC_SUBST(DBUS_LIBS)
-+
-+########### Check for DBus-Qt3 bindings
-+
-+  AC_MSG_CHECKING(for DBus-Qt3 bindings)
-+
-+  dbusqt_inc=NOTFOUND
-+  dbusqt_lib=NOTFOUND
-+  dbusqt=NOTFOUND
-+
-+  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-+  AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
-+
-+  if test -r $dbusqt_incdir/dbus/connection.h ; then
-+    have_qt_patch=0
-+    grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \
-+    > /dev/null 2>&1 && have_qt_patch=1
-+    if test $have_qt_patch = 1 ; then
-+      DBUSQT_INCS="-I$dbusqt_incdir"
-+      dbusqt_inc=FOUND
-+    fi
-+  fi
-+
-+  search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff"
-+  AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir)
-+
-+  if test -r $dbusqt_libdir/libdbus-qt-1.so ; then
-+    DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
-+    dbusqt_lib=FOUND
-+  fi
-+
-+  if test $dbusqt_inc != FOUND  || test $dbusqt_lib != FOUND ; then 
-+
-+    search_incs="`pkg-config --cflags dbus-1  |sed 's/-I//g'`"
-+    AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
-+    if test -r $dbusqt_incdir/dbus/connection.h ; then
-+      have_qt_patch=0
-+      grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \
-+      > /dev/null 2>&1 && have_qt_patch=1
-+      if test $have_qt_patch = 1 ; then
-+        DBUSQT_INCS="-I$dbusqt_incdir"
-+        dbusqt_inc=FOUND
-+      fi
-+    fi
-+
-+    search_libs="`pkg-config --libs dbus-1 --libs-only-L | sed 's/-L//g'`"
-+    AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir)
-+
-+    if test -r $dbusqt_libdir/libdbus-qt-1.so ; then
-+      DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
-+      dbusqt_lib=FOUND
-+    fi
-+
-+  fi
-+
-+
-+  if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then
-+    AC_MSG_RESULT(headers $dbusqt_incdir libraries $dbusqt_libdir)
-+    dbusqt=FOUND
-+  else
-+    AC_MSG_RESULT(searched but not found)
-+  fi
-+
-+  AC_SUBST(DBUSQT_INCS)
-+  AC_SUBST(DBUSQT_LIBS)
-+fi
-+
-+########### Check if media HAL backend sould be compiled
-+
-+AC_MSG_CHECKING(if the HAL backend for media:/ should be compiled)
-+
-+HALBACKEND=no
-+if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test "x$dbusqt" = "xFOUND" ; then
-+  AC_DEFINE_UNQUOTED([COMPILE_HALBACKEND],1, [media HAL backend compilation])
-+  HALBACKEND=yes
-+  AC_SUBST(HALBACKEND)
-+  AC_MSG_RESULT(yes)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+
-+AM_CONDITIONAL(include_media_linuxcdpolling, test "$LINUXCDPOLLING" = "yes")
-+AM_CONDITIONAL(include_media_halbackend, test "$HALBACKEND" = yes)
-+dnl =======================================================
-+dnl FILE: ./kioslave/smb/configure.in.in
-+dnl =======================================================
-+
-+AC_DEFUN([SMB_CHECK],
-+[
-+AC_REQUIRE([KDE_CHECK_LARGEFILE])
-+
-+AC_ARG_WITH(samba,
-+  [AC_HELP_STRING(--with-samba,
-+    [enable the samba ioslave @<:@default=check@:>@])],
-+  [], with_samba=check)
-+
-+have_libsmbclient=no
-+if test "x$with_samba" != xno; then
-+  have_libsmbclient=yes
-+  KDE_CHECK_HEADER(libsmbclient.h, [], [have_libsmbclient=no])
-+  KDE_CHECK_LIB(smbclient, smbc_new_context, [], [have_libsmbclient=no])
-+
-+  SMBCLIENT_EXTRA_LIBS=""
-+  AC_CHECK_FUNC(yp_get_default_domain, [],
-+  [
-+     KDE_CHECK_LIB(nsl, yp_get_default_domain, 
-+           [SMBCLIENT_EXTRA_LIBS="-lnsl"] )
-+  ])
-+
-+  AC_SUBST(SMBCLIENT_EXTRA_LIBS)
-+
-+  if test "x$with_samba" != xcheck && test "x$have_libsmbclient" = xno; then
-+    AC_MSG_ERROR([--with-samba was given, but test for libsmbclient failed])
-+  fi
-+fi
-+
-+AM_CONDITIONAL(include_kioslave_smb, test "x$have_libsmbclient" = xyes)
-+
-+])
-+
-+SMB_CHECK
-+dnl =======================================================
-+dnl FILE: ./kioslave/thumbnail/configure.in.in
-+dnl =======================================================
-+
-+AC_ARG_WITH(openexr,
-+  [AC_HELP_STRING(--with-openexr,
-+    [enable support for OpenEXR @<:@default=check@:>@])],
-+  [], with_openexr=check)
-+
-+if test "x$with_openexr" != xno; then
-+  KDE_FIND_LIBEXR
-+
-+  if test "x$with_openexr" != xcheck && test -z "$LIB_EXR"; then
-+    AC_MSG_ERROR([--with-openexr was given, but test for OpenEXR failed])
-+  fi
-+fi
-+
-+AM_CONDITIONAL(include_EXR_MODULES, test -n "$LIB_EXR")
-+dnl =======================================================
-+dnl FILE: ./klipper/configure.in.in
-+dnl =======================================================
-+
-+dnl XFixes check
-+KDE_CHECK_HEADER(X11/extensions/Xfixes.h, [xfixes_h=yes], [xfixes_h=no], [#include <X11/Xlib.h>])
-+if test "$xfixes_h" = yes; then
-+  KDE_CHECK_LIB(Xfixes, XFixesQueryExtension, [
-+    LIB_XFIXES=-lXfixes
-+    AC_DEFINE_UNQUOTED(HAVE_XFIXES, 1, [Define if you have the XFixes extension])
-+  ], [], -lXext -lX11 $X_EXTRA_LIBS)
-+else
-+  LIB_XFIXES=
-+fi
-+AC_SUBST(LIB_XFIXES)
-+dnl =======================================================
-+dnl FILE: ./konqueror/preloader/configure.in.in
-+dnl =======================================================
-+
-+dnl check whether mallinfo() is available and which fields to use to find out memory usage
-+dnl it's used in konq_mainwindow.cc
-+dnl warning, ugly code ahead
-+dnl some implementations have mallinfo() in stdlib.h, others in malloc.h
-+dnl fields showing memory usage should be hblkhd, uordblks and usmblks,
-+dnl different implementations use different combinations of these (which is ok),
-+dnl but some of them "reuse" fields they don't use for other purposes
-+
-+AC_DEFUN([KDE_MALLINFO_CHECK],
-+[
-+AC_MSG_CHECKING([for mallinfo() in $1])
-+AC_CACHE_VAL(kde_cv_func_mallinfo_$2,
-+    [
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    AC_TRY_COMPILE([#include $1],
-+	[
-+	struct mallinfo m;
-+	int dummy;
-+	m = mallinfo();
-+	dummy = m.hblkhd;
-+	dummy = m.uordblks;
-+	dummy = m.usmblks;
-+	dummy = dummy;
-+        ],
-+    kde_cv_func_mallinfo_$2=yes,
-+    kde_cv_func_mallinfo_$2=no)
-+    AC_LANG_RESTORE
-+    ])
-+if test "$kde_cv_func_mallinfo_$2" = "yes"; then
-+    kde_mallinfo_type=$2
-+fi
-+AC_MSG_RESULT($kde_cv_func_mallinfo_$2)
-+])
-+
-+
-+AC_DEFUN([KDE_MALLINFO_CHECK_FIELD],
-+[
-+AC_MSG_CHECKING([whether to use mallinfo field $1])
-+AC_CACHE_VAL(kde_cv_func_mallinfo_field_$1,
-+    [
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    AC_TRY_RUN(
-+	[
-+
-+#include <$kde_mallinfo_type.h>
-+enum use_type { No, Yes, Never };
-+use_type use_field = No;
-+const int SIZE = 4 * 1024 * 1024;
-+const int SMALL_SIZE = 4 * 1024;
-+
-+void dif( struct mallinfo& m1, struct mallinfo& m2, bool alloc )
-+    {
-+    int difval = m2.$1 - m1.$1;
-+    if( alloc )
-+	{
-+	if( difval >= SIZE && difval < 2 * SIZE && use_field != Never )
-+	    use_field = Yes;
-+	}
-+    else // !alloc
-+	{
-+	difval = -difval;
-+	if( difval > SMALL_SIZE && ( difval < SIZE || difval >= 2 * SIZE ) && use_field == Yes )
-+	    use_field = Never;
-+	}
-+    }
-+
-+int main()
-+    {
-+    free( malloc( SIZE * 2 )); // avoid Doug Lea's malloc feature of having total_max in usmblks
-+    struct mallinfo m1 = mallinfo();
-+    void* mem1 = malloc( SIZE );
-+    struct mallinfo m2 = mallinfo();
-+    free( mem1 );
-+    struct mallinfo m3 = mallinfo();
-+    void* mem2[ SIZE / 32 ];
-+    for( int i = 0;
-+	 i < SIZE / 32;
-+	 ++i )
-+	mem2[ i ] = malloc( 32 );
-+    struct mallinfo m4 = mallinfo();
-+    for( int i = 0;
-+	 i < SIZE / 32;
-+	 ++i )
-+	free( mem2[ i ] );
-+    struct mallinfo m5 = mallinfo();
-+    void* mem3[ SIZE / 1024 ];
-+    for( int i = 0;
-+	 i < SIZE / 1024;
-+	 ++i )
-+	mem3[ i ] = malloc( 1024 );
-+    struct mallinfo m6 = mallinfo();
-+    for( int i = 0;
-+	 i < SIZE / 1024;
-+	 ++i )
-+	free( mem3[ i ] );
-+    struct mallinfo m7 = mallinfo();
-+    dif( m1, m2, true );
-+    dif( m2, m3, false );
-+    dif( m3, m4, true );
-+    dif( m4, m5, false );
-+    dif( m5, m6, true );
-+    dif( m6, m7, false );
-+    return use_field == Yes ? 0 : 1;
-+    }
-+
-+        ],
-+	[kde_cv_func_mallinfo_field_$1=yes],
-+	[kde_cv_func_mallinfo_field_$1=no],
-+	[kde_cv_func_mallinfo_field_$1=no])
-+    AC_LANG_RESTORE
-+    ])
-+AC_MSG_RESULT($kde_cv_func_mallinfo_field_$1)        
-+kde_mallinfo_$1=$kde_cv_func_mallinfo_field_$1
-+if test "$kde_mallinfo_$1" = "yes"; then
-+    AC_DEFINE( KDE_MALLINFO_FIELD_$1, 1, [Use mallinfo field $1])
-+fi
-+])
-+
-+
-+kde_mallinfo_type=
-+KDE_MALLINFO_CHECK([<stdlib.h>],stdlib)
-+if test -z "$kde_mallinfo_type"; then
-+    KDE_MALLINFO_CHECK([<malloc.h>],malloc)
-+fi
-+
-+AC_TRY_LINK_FUNC(mallinfo,
-+    [],
-+    [ AC_CHECK_LIB(malloc,mallinfo,
-+	[ AC_SUBST(LIBMALLOC,"-lmalloc") ],
-+	[ kde_mallinfo_type="" ])
-+    ])
-+    
-+if test -n "$kde_mallinfo_type"; then
-+    KDE_MALLINFO_CHECK_FIELD(hblkhd)
-+    KDE_MALLINFO_CHECK_FIELD(uordblks)
-+    KDE_MALLINFO_CHECK_FIELD(usmblks)
-+    if test -z "$kde_mallinfo_hblkhd" -a \
-+	-z "$kde_mallinfo_uordblks" -a \
-+	-z "$kde_mallinfo_usmblks"; then
-+	kde_mallinfo_type=
-+    fi
-+fi
-+
-+
-+if test "$kde_mallinfo_type" = "stdlib"; then
-+    AC_DEFINE(KDE_MALLINFO_STDLIB, 1, [mallinfo() is available in <stdlib.h>])
-+elif test "$kde_mallinfo_type" = "malloc"; then
-+    AC_DEFINE(KDE_MALLINFO_MALLOC, 1, [mallinfo() is available in <malloc.h>])
-+fi
-+dnl =======================================================
-+dnl FILE: ./konsole/configure.in.in
-+dnl =======================================================
-+
-+dnl beta tests for openpty support
-+AC_MSG_CHECKING(whether we can use openpty)
-+ac_use_openpty="yes"
-+AC_ARG_ENABLE(openpty,
-+ AC_HELP_STRING([--disable-openpty],[disable openpty (UNIX98 terminals) support [default=enabled]]),
-+ [ac_use_openpty="no"])
-+if test "$ac_use_openpty" = "yes"; then
-+	kde_safe_LIBS=$LIBS
-+	LIBS="$LIBS $LIBUTIL"
-+	AC_TRY_RUN([
-+#include <pty.h>
-+
-+int main(int argc, char* argv) {
-+	int master_fd, slave_fd;
-+	int result;
-+
-+	result = openpty(&master_fd, &slave_fd, 0, 0, 0);
-+
-+	return 0;
-+}
-+], [ac_use_openpty="yes"], [ac_use_openpty="no"])
-+	LIBS=$kde_safe_LIBS
-+fi
-+if test "$ac_use_openpty" = "yes"; then
-+	AC_DEFINE(HAVE_OPENPTY, 1, [Defines whether we can use the openpty() function])
-+	AC_MSG_RESULT(yes)
-+else
-+	AC_MSG_RESULT(no)
-+fi
-+
-+dnl Set preprocessor variable of how to get cwd from a process
-+AC_MSG_CHECKING(how cwd can be be found by seperate process)
-+case "$host" in 
-+  *-*-linux*) cwd_method='proc' ;;
-+	*) cwd_method='no' ;;
-+esac
-+AC_MSG_RESULT($cwd_method)
-+
-+case "$cwd_method" in
-+	proc) AC_DEFINE(HAVE_PROC_CWD, 1, [Defines whether /proc/`pid`/cwd exists]) ;;
-+esac
-+dnl =======================================================
-+dnl FILE: ./ksmserver/configure.in.in
-+dnl =======================================================
-+
-+ac_save_LIBS="$LIBS"
-+LIBS="$LIBS $X_LDFLAGS -lICE"
-+AC_CHECK_FUNCS(_IceTransNoListen)
-+LIBS="$ac_save_LIBS"
-+dnl =======================================================
-+dnl FILE: ./ksplashml/themeengine/simple/configure.in.in
-+dnl =======================================================
-+
-+LIB_XINERAMA=
-+
-+AC_ARG_WITH([xinerama],
-+  AC_HELP_STRING([--without-xinerama], [Disable xinerama extension support (default: check)]) )
-+
-+if test "x$with_xinerama" != "xno"; then
-+  xinerama_save_ldflags="$LDFLAGS"
-+  LDFLAGS="$X_LDFLAGS"
-+
-+  KDE_CHECK_HEADER(X11/extensions/Xinerama.h,
-+    [
-+    AC_CHECK_LIB(Xinerama,XineramaQueryExtension,
-+	[
-+        AC_DEFINE(HAVE_XINERAMA, 1, [Define if you have the Xinerama extension])
-+	LIB_XINERAMA="-lXinerama -lXext"
-+        ],
-+        [],
-+        [ $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
-+     ], [],
-+     [
-+     #include <X11/Xlib.h>
-+     ] )
-+
-+  AC_SUBST(LIB_XINERAMA)
-+  LDFLAGS="$xinerama_save_ldflags"
-+fi
-+
-+dnl =======================================================
-+dnl FILE: ./ksysguard/configure.in.in
-+dnl =======================================================
-+
-+dnl Check whether ksysguardd can run; 
-+AC_MSG_CHECKING([if ksysguardd can be compiled])
-+case "$host" in 
-+  *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
-+  *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
-+  *-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
-+  *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
-+  *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
-+  *-*-irix*) ksysguardd_compile=yes; UNAME='Irix' ;;
-+  *-*-openbsd*) ksysguardd_compile=yes; UNAME='OpenBSD' ;;
-+  *) ksysguardd_compile=no; UNAME='' ;;
-+esac
-+
-+AC_MSG_RESULT($ksysguardd_compile)
-+
-+AM_CONDITIONAL(include_ksysguardd, test "$ksysguardd_compile" = "yes")
-+AM_CONDITIONAL(include_ksysguardd_linux, test "$UNAME" = Linux)
-+AM_CONDITIONAL(include_ksysguardd_freebsd, test "$UNAME" = FreeBSD)
-+AM_CONDITIONAL(include_ksysguardd_netbsd, test "$UNAME" = NetBSD)
-+AM_CONDITIONAL(include_ksysguardd_solaris, test "$UNAME" = Solaris)
-+AM_CONDITIONAL(include_ksysguardd_tru64, test "$UNAME" = Tru64)
-+AM_CONDITIONAL(include_ksysguardd_irix, test "$UNAME" = Irix)
-+AM_CONDITIONAL(include_ksysguardd_openbsd, test "$UNAME" = OpenBSD)
-+AC_SUBST(UNAME)
-+
-+AC_ARG_WITH(sensors,
-+	[AC_HELP_STRING(--with-sensors,
-+		[enable support for lm_sensors @<:@default=check@:>@])],
-+	[], with_sensors=check)
-+
-+if test "x$with_sensors" != xno; then
-+	KDE_CHECK_HEADERS(sensors/sensors.h)
-+	KDE_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
-+
-+	if test "x$with_sensors" != xcheck && test -z "$LIBSENSORS"; then
-+        	AC_MSG_ERROR([--with-sensors was given, but test for lm_sensors failed])
-+	fi
-+fi
-+
-+case "$UNAME" in
-+	Linux) LIBHOSTS="$LIBSENSORS" ;;
-+	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
-+	Solaris) LIBHOSTS="$LIBSENSORS -lkstat -lsocket" ;;
-+esac
-+AC_SUBST(LIBHOSTS)
-+AC_SUBST(LIBSENSORS)
-+
-+dnl Check for dell laptop support
-+AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
-+dnl =======================================================
-+dnl FILE: ./ksysguard/ksysguardd/configure.in.in
-+dnl =======================================================
-+
-+#MIN_CONFIG
-+
-+AC_ARG_ENABLE(dnssd, [  --disable-dnssd     don't require libdns_sd (browsing and publishing DNS-SD services will not be possible) ],  with_dnssd=$enableval, with_dnssd=yes)
-+if test "$with_dnssd" = "yes"; then
-+AC_MSG_CHECKING(for DNS-SD support)
-+save_dnssdtest_LIBS="$LIBS"
-+save_dnssdtest_LDFLAGS="$LDFLAGS"
-+save_dnssdtest_CPPFLAGS="$CPPFLAGS"
-+LDFLAGS="$all_libraries $LDFLAGS"
-+CPPFLAGS="$CPPFLAGS $all_includes"
-+case $host_os in
-+  darwin*) LIBS="" ;;
-+  *) LIBS="-ldns_sd" ;;
-+esac
-+have_libdns_sd="no"
-+AC_TRY_LINK(	[
-+			#include <dns_sd.h>
-+		],[
-+			DNSServiceRefDeallocate( (DNSServiceRef) 0);
-+			TXTRecordDeallocate( (TXTRecordRef*) 0);
-+		],[
-+			AC_DEFINE(HAVE_DNSSD,1,[Define if dns-sd is available])
-+			case $host_os in
-+				darwin*) LIB_DNSSD="" ;;
-+				*) LIB_DNSSD="-ldns_sd" ;;
-+			esac
-+			have_libdns_sd="yes"
-+			AC_MSG_RESULT(yes)
-+		],[
-+			AC_MSG_RESULT(no)
-+                        LIB_DNSSD=""
-+])
-+CPPFLAGS=$save_dnssdtest_CPPFLAGS
-+LDFLAGS=$save_dnssdtest_LDFLAGS
-+LIBS=$save_dnssdtest_LIBS
-+fi
-+AC_SUBST(LIB_DNSSD)
-+AM_CONDITIONAL(HAVE_DNSSD, test "$have_libdns_sd" = "yes")
-+dnl =======================================================
-+dnl FILE: ./kwin/kompmgr/configure.in.in
-+dnl =======================================================
-+
-+if test "x$with_composite" != "xno"; then
-+  KDE_CHECK_HEADERS(X11/extensions/Xdamage.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
-+  KDE_CHECK_HEADERS(X11/extensions/Xcomposite.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
-+  KDE_CHECK_HEADERS(X11/extensions/Xrender.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
-+else
-+  compile_kompmgr=no
-+fi
-+AM_CONDITIONAL(include_kompmgr, test x"$compile_kompmgr" != x"no" )
-+dnl =======================================================
-+dnl FILE: ./kxkb/configure.in.in
-+dnl =======================================================
-+
-+# add this here so the test programs below compile
-+KDE_CHECK_HEADER(X11/Xlib.h)
-+KDE_CHECK_HEADER(X11/extensions/XKBstr.h, ,
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE kxkb",
-+[
-+#include <X11/Xlib.h>
-+])
-+dnl Solaris lacks this file, so we should skip kxkbd here
-+KDE_CHECK_HEADER(X11/extensions/XKBrules.h, ,
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE kxkb",
-+[
-+#include <stdio.h>
-+#include <X11/Xlib.h>
-+#include <X11/XKBlib.h>
-+])
-+KDE_CREATE_SUBDIRSLIST
-+AM_CONDITIONAL(libkonq_SUBDIR_included, test "x$libkonq_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(applnk_SUBDIR_included, test "x$applnk_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(drkonqi_SUBDIR_included, test "x$drkonqi_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kappfinder_SUBDIR_included, test "x$kappfinder_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kate_SUBDIR_included, test "x$kate_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kcheckpass_SUBDIR_included, test "x$kcheckpass_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kcminit_SUBDIR_included, test "x$kcminit_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kdcop_SUBDIR_included, test "x$kdcop_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kdebugdialog_SUBDIR_included, test "x$kdebugdialog_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kdeeject_SUBDIR_included, test "x$kdeeject_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kdepasswd_SUBDIR_included, test "x$kdepasswd_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kdeprint_SUBDIR_included, test "x$kdeprint_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kdesu_SUBDIR_included, test "x$kdesu_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kdialog_SUBDIR_included, test "x$kdialog_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kdmlib_SUBDIR_included, test "x$kdmlib_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kfind_SUBDIR_included, test "x$kfind_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(khelpcenter_SUBDIR_included, test "x$khelpcenter_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(khotkeys_SUBDIR_included, test "x$khotkeys_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kioslave_SUBDIR_included, test "x$kioslave_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(klipper_SUBDIR_included, test "x$klipper_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kmenuedit_SUBDIR_included, test "x$kmenuedit_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(knetattach_SUBDIR_included, test "x$knetattach_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(konsole_SUBDIR_included, test "x$konsole_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kpager_SUBDIR_included, test "x$kpager_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kpersonalizer_SUBDIR_included, test "x$kpersonalizer_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kreadconfig_SUBDIR_included, test "x$kreadconfig_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kscreensaver_SUBDIR_included, test "x$kscreensaver_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(ksplashml_SUBDIR_included, test "x$ksplashml_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kstart_SUBDIR_included, test "x$kstart_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(ksysguard_SUBDIR_included, test "x$ksysguard_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(ksystraycmd_SUBDIR_included, test "x$ksystraycmd_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(ktip_SUBDIR_included, test "x$ktip_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kwin_SUBDIR_included, test "x$kwin_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kxkb_SUBDIR_included, test "x$kxkb_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(l10n_SUBDIR_included, test "x$l10n_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(nsplugins_SUBDIR_included, test "x$nsplugins_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(pics_SUBDIR_included, test "x$pics_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(konqueror_SUBDIR_included, test "x$konqueror_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(ksmserver_SUBDIR_included, test "x$ksmserver_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kicker_SUBDIR_included, test "x$kicker_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kcontrol_SUBDIR_included, test "x$kcontrol_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kdesktop_SUBDIR_included, test "x$kdesktop_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(kdm_SUBDIR_included, test "x$kdm_SUBDIR_included" = xyes)
-+AC_CONFIG_FILES([ Makefile ])
-+AC_CONFIG_FILES([ applnk/Makefile ])
-+AC_CONFIG_FILES([ applnk/compat/Makefile ])
-+AC_CONFIG_FILES([ doc/Makefile ])
-+AC_CONFIG_FILES([ doc/faq/Makefile ])
-+AC_CONFIG_FILES([ doc/glossary/Makefile ])
-+AC_CONFIG_FILES([ doc/kappfinder/Makefile ])
-+AC_CONFIG_FILES([ doc/kate/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/arts/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/background/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/bell/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/cache/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/clock/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/colors/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/cookies/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/crypto/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/desktop/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/desktopbehavior/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/ebrowsing/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/email/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/energy/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/filemanager/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/filetypes/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/fonts/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/helpindex/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/icons/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/kcmaccess/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/kcmcss/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/kcmfontinst/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/kcmkonsole/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/kcmlaunch/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/kcmnotify/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/kcmsmserver/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/kcmstyle/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/kcmtaskbar/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/kdm/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/keyboard/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/keys/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/khtml/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/kwindecoration/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/language/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/mouse/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/netpref/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/panel/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/panelappearance/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/passwords/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/performance/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/proxy/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/screensaver/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/smb/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/spellchecking/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/useragent/Makefile ])
-+AC_CONFIG_FILES([ doc/kcontrol/windowmanagement/Makefile ])
-+AC_CONFIG_FILES([ doc/kdcop/Makefile ])
-+AC_CONFIG_FILES([ doc/kdebugdialog/Makefile ])
-+AC_CONFIG_FILES([ doc/kdeprint/Makefile ])
-+AC_CONFIG_FILES([ doc/kdesu/Makefile ])
-+AC_CONFIG_FILES([ doc/kdm/Makefile ])
-+AC_CONFIG_FILES([ doc/kfind/Makefile ])
-+AC_CONFIG_FILES([ doc/khelpcenter/Makefile ])
-+AC_CONFIG_FILES([ doc/kicker/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/cdinfo/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/devices/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/dma/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/interrupts/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/ioports/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/memory/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/nics/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/opengl/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/partitions/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/pci/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/pcmcia/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/processor/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/protocols/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/samba/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/scsi/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/sound/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/usb/Makefile ])
-+AC_CONFIG_FILES([ doc/kinfocenter/xserver/Makefile ])
-+AC_CONFIG_FILES([ doc/kioslave/Makefile ])
-+AC_CONFIG_FILES([ doc/klipper/Makefile ])
-+AC_CONFIG_FILES([ doc/kmenuedit/Makefile ])
-+AC_CONFIG_FILES([ doc/knetattach/Makefile ])
-+AC_CONFIG_FILES([ doc/kompmgr/Makefile ])
-+AC_CONFIG_FILES([ doc/konqueror/Makefile ])
-+AC_CONFIG_FILES([ doc/konsole/Makefile ])
-+AC_CONFIG_FILES([ doc/kpager/Makefile ])
-+AC_CONFIG_FILES([ doc/ksplashml/Makefile ])
-+AC_CONFIG_FILES([ doc/ksysguard/Makefile ])
-+AC_CONFIG_FILES([ doc/kwrite/Makefile ])
-+AC_CONFIG_FILES([ doc/kxkb/Makefile ])
-+AC_CONFIG_FILES([ doc/quickstart/Makefile ])
-+AC_CONFIG_FILES([ doc/userguide/Makefile ])
-+AC_CONFIG_FILES([ doc/visualdict/Makefile ])
-+AC_CONFIG_FILES([ drkonqi/Makefile ])
-+AC_CONFIG_FILES([ drkonqi/debuggers/Makefile ])
-+AC_CONFIG_FILES([ drkonqi/pics/Makefile ])
-+AC_CONFIG_FILES([ drkonqi/presets/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Development/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Games/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Games/Arcade/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Games/Board/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Games/Card/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Games/Emulators/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Games/Roguelikes/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Games/TacticStrategy/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Games/Toys/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Graphics/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Internet/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Internet/Terminal/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Multimedia/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Office/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/System/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/System/Terminal/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Utilities/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Utilities/Editors/Makefile ])
-+AC_CONFIG_FILES([ kappfinder/apps/Utilities/xutils/Makefile ])
-+AC_CONFIG_FILES([ kate/Makefile ])
-+AC_CONFIG_FILES([ kate/app/Makefile ])
-+AC_CONFIG_FILES([ kate/data/Makefile ])
-+AC_CONFIG_FILES([ kate/interfaces/Makefile ])
-+AC_CONFIG_FILES([ kate/pics/Makefile ])
-+AC_CONFIG_FILES([ kate/pics/actions/Makefile ])
-+AC_CONFIG_FILES([ kate/utils/Makefile ])
-+AC_CONFIG_FILES([ kcheckpass/Makefile ])
-+AC_CONFIG_FILES([ kcminit/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/access/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/accessibility/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/arts/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/background/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/background/pics/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/bell/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/clock/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/colors/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/componentchooser/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/componentchooser/componentservices/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/crypto/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/css/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/display/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/dnssd/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/ebrowsing/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/ebrowsing/plugins/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/ebrowsing/plugins/ikws/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/ebrowsing/plugins/localdomain/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/ebrowsing/plugins/shorturi/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/energy/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/energy/pics/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/filetypes/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/fonts/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/icons/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/info/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/input/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/input/core/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/input/pics/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/input/xcursor/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/ioslaveinfo/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/joystick/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kcontrol/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kcontrol/about/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kded/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kdm/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/keys/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kfontinst/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kfontinst/kcmfontinst/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kfontinst/kfile-plugin/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kfontinst/kfontinst/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kfontinst/kio/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kfontinst/lib/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kfontinst/thumbnail/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kfontinst/viewpart/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kicker/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kio/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kio/uasproviders/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/knotify/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/knotify/sounds/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/konq/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/konqhtml/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/konsole/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/ad/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/kcs/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/pics/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/HighContrastDark/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/HighContrastDark-big/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/HighContrastLight/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/HighContrastLight-big/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/KDE_Classic/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/Keramik/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/Plastik/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/Platinum/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/Redmond/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/Sunshine/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/YellowOnBlue/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/krdb/themes/YellowOnBlue-big/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/kthememanager/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/launch/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/locale/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/locale/default/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/locale/pics/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/nics/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/performance/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/pics/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/privacy/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/randr/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/samba/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/screensaver/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/smartcard/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/smserver/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/spellchecking/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/style/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/style/keramik/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/taskbar/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/usbview/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/view1394/Makefile ])
-+AC_CONFIG_FILES([ kcontrol/xinerama/Makefile ])
-+AC_CONFIG_FILES([ kdcop/Makefile ])
-+AC_CONFIG_FILES([ kdebugdialog/Makefile ])
-+AC_CONFIG_FILES([ kdeeject/Makefile ])
-+AC_CONFIG_FILES([ kdepasswd/Makefile ])
-+AC_CONFIG_FILES([ kdepasswd/kcm/Makefile ])
-+AC_CONFIG_FILES([ kdepasswd/kcm/pics/Makefile ])
-+AC_CONFIG_FILES([ kdeprint/Makefile ])
-+AC_CONFIG_FILES([ kdeprint/descriptions/Makefile ])
-+AC_CONFIG_FILES([ kdeprint/kdeprint_part/Makefile ])
-+AC_CONFIG_FILES([ kdeprint/kdeprintfax/Makefile ])
-+AC_CONFIG_FILES([ kdeprint/kjobviewer/Makefile ])
-+AC_CONFIG_FILES([ kdeprint/kprinter/Makefile ])
-+AC_CONFIG_FILES([ kdeprint/printmgr/Makefile ])
-+AC_CONFIG_FILES([ kdeprint/slave/Makefile ])
-+AC_CONFIG_FILES([ kdeprint/slave/mimetypes/Makefile ])
-+AC_CONFIG_FILES([ kdeprint/slave/templates/Makefile ])
-+AC_CONFIG_FILES([ kdesktop/Makefile ])
-+AC_CONFIG_FILES([ kdesktop/init/Makefile ])
-+AC_CONFIG_FILES([ kdesktop/init/Templates/Makefile ])
-+AC_CONFIG_FILES([ kdesktop/kwebdesktop/Makefile ])
-+AC_CONFIG_FILES([ kdesktop/lock/Makefile ])
-+AC_CONFIG_FILES([ kdesktop/patterns/Makefile ])
-+AC_CONFIG_FILES([ kdesktop/pics/Makefile ])
-+AC_CONFIG_FILES([ kdesktop/programs/Makefile ])
-+AC_CONFIG_FILES([ kdesu/Makefile ])
-+AC_CONFIG_FILES([ kdesu/kdesu/Makefile ])
-+AC_CONFIG_FILES([ kdesu/kdesud/Makefile ])
-+AC_CONFIG_FILES([ kdialog/Makefile ])
-+AC_CONFIG_FILES([ kdm/Makefile ])
-+AC_CONFIG_FILES([ kdm/backend/Makefile ])
-+AC_CONFIG_FILES([ kdm/kfrontend/Makefile ])
-+AC_CONFIG_FILES([ kdm/kfrontend/pics/Makefile ])
-+AC_CONFIG_FILES([ kdm/kfrontend/sessions/Makefile ])
-+AC_CONFIG_FILES([ kdm/kfrontend/themer/Makefile ])
-+AC_CONFIG_FILES([ kdm/kfrontend/themes/Makefile ])
-+AC_CONFIG_FILES([ kdm/kfrontend/themes/circles/Makefile ])
-+AC_CONFIG_FILES([ kdmlib/Makefile ])
-+AC_CONFIG_FILES([ kfind/Makefile ])
-+AC_CONFIG_FILES([ kfind/pics/Makefile ])
-+AC_CONFIG_FILES([ khelpcenter/Makefile ])
-+AC_CONFIG_FILES([ khelpcenter/htmlsearch/Makefile ])
-+AC_CONFIG_FILES([ khelpcenter/pics/Makefile ])
-+AC_CONFIG_FILES([ khelpcenter/plugins/Makefile ])
-+AC_CONFIG_FILES([ khelpcenter/plugins/Applications/Makefile ])
-+AC_CONFIG_FILES([ khelpcenter/plugins/Manpages/Makefile ])
-+AC_CONFIG_FILES([ khelpcenter/plugins/Scrollkeeper/Makefile ])
-+AC_CONFIG_FILES([ khelpcenter/plugins/Tutorials/Makefile ])
-+AC_CONFIG_FILES([ khelpcenter/searchhandlers/Makefile ])
-+AC_CONFIG_FILES([ khotkeys/Makefile ])
-+AC_CONFIG_FILES([ khotkeys/app/Makefile ])
-+AC_CONFIG_FILES([ khotkeys/arts/Makefile ])
-+AC_CONFIG_FILES([ khotkeys/data/Makefile ])
-+AC_CONFIG_FILES([ khotkeys/kcontrol/Makefile ])
-+AC_CONFIG_FILES([ khotkeys/kcontrol/ui/Makefile ])
-+AC_CONFIG_FILES([ khotkeys/shared/Makefile ])
-+AC_CONFIG_FILES([ khotkeys/update/Makefile ])
-+AC_CONFIG_FILES([ kicker/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/clock/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/launcher/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/lockout/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/media/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/menu/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/minipager/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/naughty/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/run/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/swallow/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/systemtray/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/taskbar/Makefile ])
-+AC_CONFIG_FILES([ kicker/applets/trash/Makefile ])
-+AC_CONFIG_FILES([ kicker/data/Makefile ])
-+AC_CONFIG_FILES([ kicker/data/app_start_anim/Makefile ])
-+AC_CONFIG_FILES([ kicker/data/icons/Makefile ])
-+AC_CONFIG_FILES([ kicker/data/icons/actions/Makefile ])
-+AC_CONFIG_FILES([ kicker/data/kmenu_side/Makefile ])
-+AC_CONFIG_FILES([ kicker/data/tiles/Makefile ])
-+AC_CONFIG_FILES([ kicker/data/wallpaper/Makefile ])
-+AC_CONFIG_FILES([ kicker/extensions/Makefile ])
-+AC_CONFIG_FILES([ kicker/extensions/dockbar/Makefile ])
-+AC_CONFIG_FILES([ kicker/extensions/kasbar/Makefile ])
-+AC_CONFIG_FILES([ kicker/extensions/sidebar/Makefile ])
-+AC_CONFIG_FILES([ kicker/extensions/taskbar/Makefile ])
-+AC_CONFIG_FILES([ kicker/kicker/Makefile ])
-+AC_CONFIG_FILES([ kicker/kicker/buttons/Makefile ])
-+AC_CONFIG_FILES([ kicker/kicker/core/Makefile ])
-+AC_CONFIG_FILES([ kicker/kicker/ui/Makefile ])
-+AC_CONFIG_FILES([ kicker/libkicker/Makefile ])
-+AC_CONFIG_FILES([ kicker/menuext/Makefile ])
-+AC_CONFIG_FILES([ kicker/menuext/find/Makefile ])
-+AC_CONFIG_FILES([ kicker/menuext/kate/Makefile ])
-+AC_CONFIG_FILES([ kicker/menuext/kdeprint/Makefile ])
-+AC_CONFIG_FILES([ kicker/menuext/konq-profiles/Makefile ])
-+AC_CONFIG_FILES([ kicker/menuext/konsole/Makefile ])
-+AC_CONFIG_FILES([ kicker/menuext/prefmenu/Makefile ])
-+AC_CONFIG_FILES([ kicker/menuext/recentdocs/Makefile ])
-+AC_CONFIG_FILES([ kicker/menuext/remote/Makefile ])
-+AC_CONFIG_FILES([ kicker/menuext/system/Makefile ])
-+AC_CONFIG_FILES([ kicker/menuext/tom/Makefile ])
-+AC_CONFIG_FILES([ kicker/proxy/Makefile ])
-+AC_CONFIG_FILES([ kicker/taskbar/Makefile ])
-+AC_CONFIG_FILES([ kicker/taskmanager/Makefile ])
-+AC_CONFIG_FILES([ kioslave/Makefile ])
-+AC_CONFIG_FILES([ kioslave/about/Makefile ])
-+AC_CONFIG_FILES([ kioslave/cgi/Makefile ])
-+AC_CONFIG_FILES([ kioslave/cgi/kcmcgi/Makefile ])
-+AC_CONFIG_FILES([ kioslave/filter/Makefile ])
-+AC_CONFIG_FILES([ kioslave/finger/Makefile ])
-+AC_CONFIG_FILES([ kioslave/fish/Makefile ])
-+AC_CONFIG_FILES([ kioslave/floppy/Makefile ])
-+AC_CONFIG_FILES([ kioslave/home/Makefile ])
-+AC_CONFIG_FILES([ kioslave/home/kdedmodule/Makefile ])
-+AC_CONFIG_FILES([ kioslave/info/Makefile ])
-+AC_CONFIG_FILES([ kioslave/ldap/Makefile ])
-+AC_CONFIG_FILES([ kioslave/mac/Makefile ])
-+AC_CONFIG_FILES([ kioslave/man/Makefile ])
-+AC_CONFIG_FILES([ kioslave/media/Makefile ])
-+AC_CONFIG_FILES([ kioslave/media/kcmodule/Makefile ])
-+AC_CONFIG_FILES([ kioslave/media/kfile-plugin/Makefile ])
-+AC_CONFIG_FILES([ kioslave/media/libmediacommon/Makefile ])
-+AC_CONFIG_FILES([ kioslave/media/mediamanager/Makefile ])
-+AC_CONFIG_FILES([ kioslave/media/medianotifier/Makefile ])
-+AC_CONFIG_FILES([ kioslave/media/mimetypes/Makefile ])
-+AC_CONFIG_FILES([ kioslave/media/mounthelper/Makefile ])
-+AC_CONFIG_FILES([ kioslave/media/propsdlgplugin/Makefile ])
-+AC_CONFIG_FILES([ kioslave/media/services/Makefile ])
-+AC_CONFIG_FILES([ kioslave/nfs/Makefile ])
-+AC_CONFIG_FILES([ kioslave/nntp/Makefile ])
-+AC_CONFIG_FILES([ kioslave/pop3/Makefile ])
-+AC_CONFIG_FILES([ kioslave/remote/Makefile ])
-+AC_CONFIG_FILES([ kioslave/remote/kdedmodule/Makefile ])
-+AC_CONFIG_FILES([ kioslave/settings/Makefile ])
-+AC_CONFIG_FILES([ kioslave/sftp/Makefile ])
-+AC_CONFIG_FILES([ kioslave/smb/Makefile ])
-+AC_CONFIG_FILES([ kioslave/smtp/Makefile ])
-+AC_CONFIG_FILES([ kioslave/system/Makefile ])
-+AC_CONFIG_FILES([ kioslave/system/entries/Makefile ])
-+AC_CONFIG_FILES([ kioslave/system/kdedmodule/Makefile ])
-+AC_CONFIG_FILES([ kioslave/system/mimetypes/Makefile ])
-+AC_CONFIG_FILES([ kioslave/tar/Makefile ])
-+AC_CONFIG_FILES([ kioslave/thumbnail/Makefile ])
-+AC_CONFIG_FILES([ kioslave/trash/Makefile ])
-+AC_CONFIG_FILES([ kioslave/trash/kfile-plugin/Makefile ])
-+AC_CONFIG_FILES([ klipper/Makefile ])
-+AC_CONFIG_FILES([ kmenuedit/Makefile ])
-+AC_CONFIG_FILES([ kmenuedit/pixmaps/Makefile ])
-+AC_CONFIG_FILES([ knetattach/Makefile ])
-+AC_CONFIG_FILES([ konqueror/Makefile ])
-+AC_CONFIG_FILES([ konqueror/about/Makefile ])
-+AC_CONFIG_FILES([ konqueror/client/Makefile ])
-+AC_CONFIG_FILES([ konqueror/iconview/Makefile ])
-+AC_CONFIG_FILES([ konqueror/keditbookmarks/Makefile ])
-+AC_CONFIG_FILES([ konqueror/kttsplugin/Makefile ])
-+AC_CONFIG_FILES([ konqueror/listview/Makefile ])
-+AC_CONFIG_FILES([ konqueror/pics/Makefile ])
-+AC_CONFIG_FILES([ konqueror/pics/actions/Makefile ])
-+AC_CONFIG_FILES([ konqueror/pics/indicators/Makefile ])
-+AC_CONFIG_FILES([ konqueror/pics/tiles/Makefile ])
-+AC_CONFIG_FILES([ konqueror/preloader/Makefile ])
-+AC_CONFIG_FILES([ konqueror/quickprint/Makefile ])
-+AC_CONFIG_FILES([ konqueror/remoteencodingplugin/Makefile ])
-+AC_CONFIG_FILES([ konqueror/shellcmdplugin/Makefile ])
-+AC_CONFIG_FILES([ konqueror/sidebar/Makefile ])
-+AC_CONFIG_FILES([ konqueror/sidebar/test/Makefile ])
-+AC_CONFIG_FILES([ konqueror/sidebar/trees/Makefile ])
-+AC_CONFIG_FILES([ konqueror/sidebar/trees/bookmark_module/Makefile ])
-+AC_CONFIG_FILES([ konqueror/sidebar/trees/dirtree_module/Makefile ])
-+AC_CONFIG_FILES([ konqueror/sidebar/trees/history_module/Makefile ])
-+AC_CONFIG_FILES([ konqueror/sidebar/trees/init/Makefile ])
-+AC_CONFIG_FILES([ konqueror/sidebar/trees/init/remote/Makefile ])
-+AC_CONFIG_FILES([ konqueror/sidebar/trees/init/remote/ftp/Makefile ])
-+AC_CONFIG_FILES([ konqueror/sidebar/trees/init/remote/web/Makefile ])
-+AC_CONFIG_FILES([ konqueror/sidebar/trees/init/services/Makefile ])
-+AC_CONFIG_FILES([ konqueror/sidebar/web_module/Makefile ])
-+AC_CONFIG_FILES([ konsole/Makefile ])
-+AC_CONFIG_FILES([ konsole/doc/Makefile ])
-+AC_CONFIG_FILES([ konsole/doc/VT100/Makefile ])
-+AC_CONFIG_FILES([ konsole/fonts/Makefile ])
-+AC_CONFIG_FILES([ konsole/konsole/Makefile ])
-+AC_CONFIG_FILES([ konsole/other/Makefile ])
-+AC_CONFIG_FILES([ konsole/other/icons/Makefile ])
-+AC_CONFIG_FILES([ konsole/other/wallpapers/Makefile ])
-+AC_CONFIG_FILES([ kpager/Makefile ])
-+AC_CONFIG_FILES([ kpersonalizer/Makefile ])
-+AC_CONFIG_FILES([ kpersonalizer/pics/Makefile ])
-+AC_CONFIG_FILES([ kreadconfig/Makefile ])
-+AC_CONFIG_FILES([ kscreensaver/Makefile ])
-+AC_CONFIG_FILES([ ksmserver/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/kcmksplash/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/kcmksplash/pics/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/pics/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/pics/themes/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/pics/themes/blue-bend/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/pics/themes/default/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/pics/themes/default/locolor/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/pics/themes/none/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/pics/themes/simple/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/themeengine/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/themeengine/default/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/themeengine/redmond/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/themeengine/redmond/pics/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/themeengine/simple/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/themeengine/standard/Makefile ])
-+AC_CONFIG_FILES([ ksplashml/themeengine/standard/pics/Makefile ])
-+AC_CONFIG_FILES([ kstart/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/CContLib/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/example/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/gui/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/gui/SensorDisplayLib/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/gui/ksgrd/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/ksysguardd/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/ksysguardd/FreeBSD/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/ksysguardd/Irix/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/ksysguardd/Linux/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/ksysguardd/NetBSD/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/ksysguardd/OpenBSD/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/ksysguardd/Solaris/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/ksysguardd/Tru64/Makefile ])
-+AC_CONFIG_FILES([ ksysguard/pics/Makefile ])
-+AC_CONFIG_FILES([ ksystraycmd/Makefile ])
-+AC_CONFIG_FILES([ ktip/Makefile ])
-+AC_CONFIG_FILES([ ktip/pics/Makefile ])
-+AC_CONFIG_FILES([ kwin/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/b2/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/b2/config/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/default/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/default/config/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/keramik/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/keramik/config/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/kwmtheme/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/kwmtheme/cli_installer/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/laptop/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/modernsystem/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/modernsystem/config/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/plastik/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/plastik/config/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/quartz/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/quartz/config/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/redmond/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/test/Makefile ])
-+AC_CONFIG_FILES([ kwin/clients/web/Makefile ])
-+AC_CONFIG_FILES([ kwin/data/Makefile ])
-+AC_CONFIG_FILES([ kwin/kcmkwin/Makefile ])
-+AC_CONFIG_FILES([ kwin/kcmkwin/kwindecoration/Makefile ])
-+AC_CONFIG_FILES([ kwin/kcmkwin/kwinoptions/Makefile ])
-+AC_CONFIG_FILES([ kwin/kcmkwin/kwinrules/Makefile ])
-+AC_CONFIG_FILES([ kwin/killer/Makefile ])
-+AC_CONFIG_FILES([ kwin/kompmgr/Makefile ])
-+AC_CONFIG_FILES([ kwin/lib/Makefile ])
-+AC_CONFIG_FILES([ kwin/oldheaders/Makefile ])
-+AC_CONFIG_FILES([ kwin/pics/Makefile ])
-+AC_CONFIG_FILES([ kwin/tools/Makefile ])
-+AC_CONFIG_FILES([ kwin/tools/decobenchmark/Makefile ])
-+AC_CONFIG_FILES([ kxkb/Makefile ])
-+AC_CONFIG_FILES([ kxkb/pics/Makefile ])
-+AC_CONFIG_FILES([ l10n/Makefile ])
-+AC_CONFIG_FILES([ libkonq/Makefile ])
-+AC_CONFIG_FILES([ libkonq/favicons/Makefile ])
-+AC_CONFIG_FILES([ libkonq/pics/Makefile ])
-+AC_CONFIG_FILES([ libkonq/tests/Makefile ])
-+AC_CONFIG_FILES([ nsplugins/Makefile ])
-+AC_CONFIG_FILES([ nsplugins/test/Makefile ])
-+AC_CONFIG_FILES([ nsplugins/viewer/Makefile ])
-+AC_CONFIG_FILES([ nsplugins/wrapper/Makefile ])
-+AC_CONFIG_FILES([ pics/Makefile ])
-+AC_CONFIG_FILES([ pics/crystalsvg/Makefile ])
-+AC_CONFIG_FILES([ pics/wallpapers/Makefile ])
-+AC_CONFIG_FILES([ kdm/kfrontend/sessions/kde.desktop ])
-+AC_CONFIG_FILES([ khelpcenter/searchhandlers/khc_docbookdig.pl ])
-+AC_CONFIG_FILES([ khelpcenter/searchhandlers/khc_htdig.pl ])
-+AC_OUTPUT
-+if test x$have_gl = xno; then
-+  echo ""
-+  echo "You are missing"
-+  if test "$ac_cv_header_GL_gl_h" = "no"; then
-+    echo "    - OpenGL (mesa)"
-+  fi
-+  if test "$ac_cv_header_GL_glu_h" = "no"; then
-+    echo "    - GLU"
-+  fi
-+  echo "OpenGL information module has been disabled."
-+  echo ""
-+  all_tests=bad
-+fi
-+if test "x$with_libusb" = xcheck && test "x$have_libusb" = xno; then
-+  echo ""
-+  echo "Logitech mouse support is disabled. Provide libusb to enable it."
-+  echo ""
-+fi
-+dnl put here things which have to be done as very last part of configure
-+
-+if test -z "$FONTINST_SUBDIR"; then
-+  echo ""
-+  echo "KFontInstall control module got disabled from compilation"
-+  echo "because of missing FreeType 2.x libraries/headers."
-+  echo "You can download the freetype library from http://www.freetype.org/."
-+  echo ""
-+  all_tests=bad
-+fi
-+
-+
-+if $kdm_no_Xau; then
-+  AC_MSG_WARN([Cannot build KDM! Make sure that libXau.a is installed!])
-+fi
-+if $kdm_no_Xdmcp; then
-+  AC_MSG_WARN([Cannot build KDM! Make sure that libXdmcp.a and Xdmcp.h 
-+are installed or use --without-xdmcp to disable XDMCP support!])
-+fi
-+
-+if test -z "$SASL2_LIBS"; then
-+  echo ""
-+  echo "cyrus-sasl 2 library is missing. The pop3 and smtp ioslaves will lack of a lot of authentication methods."
-+  echo "See http://asg.web.cmu.edu/sasl/sasl-library.html or your distribution's packages."
-+  echo ""
-+  all_tests=bad
-+fi
-+if test "x$with_samba" = xcheck && test "x$have_libsmbclient" = xno; then
-+  echo ""
-+  echo "You're missing libsmbclient from samba 3.0"
-+  echo "KDE will not be able to browse windows shares without it,"
-+  echo "consider installing it."
-+  echo "Look at kioslave/smb/libsmbclient-HOWTO.txt"
-+  echo ""
-+  all_tests=bad
-+fi
-+dnl put here things which have to be done as very last part of configure
-+
-+if test "d58a0606ed616820de291d594602665d" '!=' `echo fnord | $MD5SUM | cut -d ' ' $MD5SUM_CUT` ; then
-+  echo ""
-+  echo "Your md5 program ( $MD5SUM | cut -d ' ' $MD5SUM_CUT ) produces broken output."
-+  echo "The fish:// IOSlave may not function correctly."
-+  echo ""
-+fi
-+
-+if test "$EXRSTATUS" = "no"; then
-+  echo ""
-+  echo "No OpenEXR Libraries were found"
-+  echo "Install the OpenEXR package (from http://www.openexr.org)"
-+  echo "if you want EXR image format support"
-+  echo ""
-+fi
-+
-+if test "$EXRSTATUS" = "old"; then
-+  echo ""
-+  echo "OpenEXR libraries were found, but at least version 1.1.0 is required"
-+  echo "Install a newer OpenEXR package (from http://www.openexr.org)"
-+  echo "if you want EXR image format support"
-+  echo ""
-+fi
-+
-+# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
-+if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
-+  # And if so, warn when they don't match
-+  if test "$kde_libs_prefix" != "$given_prefix"; then
-+    # And if kde doesn't know about the prefix yet
-+    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
-+    if test $? -ne 0; then
-+      echo ""
-+      echo "Warning: you chose to install this package in $given_prefix,"
-+      echo "but KDE was found in $kde_libs_prefix."
-+      echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
-+      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
-+      echo "Then restart KDE."
-+      echo ""
-+    fi
-+  fi
-+fi
-+
-+if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
-+  echo ""
-+  echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
-+  echo "was not included. Therefore, GCC symbol visibility support remains disabled."
-+  echo ""
-+  echo "For better performance, consider including the Qt visibility supporting patch"
-+  echo "located at:"
-+  echo ""
-+  echo "http://bugs.kde.org/show_bug.cgi?id=109386"
-+  echo ""
-+  echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
-+  echo "everything will continue to work just fine without it."
-+  echo ""
-+fi
-+
-+if test "$all_tests" = "bad"; then
-+  if test ! "$cache_file" = "/dev/null"; then
-+    echo ""
-+    echo "Please remove the file $cache_file after changing your setup"
-+    echo "so that configure will find the changes next time."
-+    echo ""
-+  fi
-+else
-+  echo ""
-+  echo "Good - your configure finished. Start make now"
-+  echo ""
-+fi
+ 
+ KDE_SET_PREFIX
+ 
 --- doc/faq/Makefile.in
 +++ doc/faq/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/faq
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = khelpcenter/faq
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/faq/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/faq/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/faq/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/faq/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/faq/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=desktop.docbook about.docbook winmng.docbook qt.docbook tips.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook configkde.docbook install.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) contrib.docbook notrelated.docbook nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook TODO kdeapps.docbook sound.docbook configkde.docbook questions.docbook misc.docbook intro.docbook panel.docbook webbrowse.docbook winmng.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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq
-+	@for base in contrib.docbook notrelated.docbook nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook TODO kdeapps.docbook sound.docbook configkde.docbook questions.docbook misc.docbook intro.docbook panel.docbook webbrowse.docbook winmng.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in contrib.docbook notrelated.docbook nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook TODO kdeapps.docbook sound.docbook configkde.docbook questions.docbook misc.docbook intro.docbook panel.docbook webbrowse.docbook winmng.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in contrib.docbook notrelated.docbook nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook TODO kdeapps.docbook sound.docbook configkde.docbook questions.docbook misc.docbook intro.docbook panel.docbook webbrowse.docbook winmng.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/faq/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/faq/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/faq/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/glossary/Makefile.in
 +++ doc/glossary/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/glossary
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = khelpcenter/glossary
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/glossary/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/glossary/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/glossary/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/glossary/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/glossary/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=kdeprintingglossary.docbook index.docbook Makefile.in checkxrefs Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdeprintingglossary.docbook checkxrefs 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary
-+	@for base in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/glossary/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/glossary/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/glossary/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kappfinder/Makefile.in
 +++ doc/kappfinder/Makefile.in
-@@ -0,0 +1,826 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kappfinder
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = AUTO
-+KDE_MANS = AUTO
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kappfinder/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kappfinder/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kappfinder/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kappfinder/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kappfinder/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -582,9 +591,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=man-kappfinder.1.docbook Makefile.in Makefile.am 
-+
-+#>+ 2
-+docs-am: man-kappfinder.1.docbook 
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kappfinder
-+	@for base in man-kappfinder.1.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kappfinder/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kappfinder/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in man-kappfinder.1.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kappfinder/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in man-kappfinder.1.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kappfinder/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kappfinder/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kappfinder/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kate/Makefile.in
 +++ doc/kate/Makefile.in
-@@ -0,0 +1,848 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kate
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = AUTO
-+KDE_MANS = AUTO
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kate/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kate/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kate/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kate/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kate/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -582,9 +591,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=configuring.docbook plugins.docbook index.docbook regular-expressions.docbook mdi.docbook configdialog02.png fundamentals.docbook Makefile.in man-kate.1.docbook unhighlighted.png part.docbook highlighting.docbook menus.docbook configdialog01.png advanced.docbook highlighted.png Makefile.am kate.png mimetypechooser.png 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook regular-expressions.docbook highlighted.png TODO menus.docbook unhighlighted.png kate.png configdialog01.png configdialog02.png man-kate.1.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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate
-+	@for base in highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook regular-expressions.docbook highlighted.png TODO menus.docbook unhighlighted.png kate.png configdialog01.png configdialog02.png man-kate.1.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook regular-expressions.docbook highlighted.png TODO menus.docbook unhighlighted.png kate.png configdialog01.png configdialog02.png man-kate.1.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook regular-expressions.docbook highlighted.png TODO menus.docbook unhighlighted.png kate.png configdialog01.png configdialog02.png man-kate.1.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kate/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kate/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kate/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/arts/Makefile.in
 +++ doc/kcontrol/arts/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/arts
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/arts
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/arts/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/arts/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/arts/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/arts/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/arts/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=midi.docbook index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) midi.docbook 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts
-+	@for base in midi.docbook index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in midi.docbook index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in midi.docbook index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/arts/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/arts/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/arts/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/background/Makefile.in
 +++ doc/kcontrol/background/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/background
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/background
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/background/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/background/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/background/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/background/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/background/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/background
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/background/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/background/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/background/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/background/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/background/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/background/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/background
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/background
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/background/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/background/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/background/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/background/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/background/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/background/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/bell/Makefile.in
 +++ doc/kcontrol/bell/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/bell
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/bell
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/bell/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/bell/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/bell/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/bell/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/bell/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/bell
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/bell/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/bell/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/bell/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/bell/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/bell/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/bell/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/bell
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/bell
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/bell/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/bell/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/bell/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/bell/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/bell/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/bell/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/cache/Makefile.in
 +++ doc/kcontrol/cache/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/cache
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/cache
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/cache/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/cache/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/cache/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/cache/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/cache/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cache
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cache/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cache/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cache/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cache/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cache/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cache/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cache
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cache
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cache/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cache/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cache/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/cache/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/cache/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/cache/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/clock/Makefile.in
 +++ doc/kcontrol/clock/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/clock
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/clock
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/clock/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/clock/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/clock/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/clock/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/clock/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/clock
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/clock/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/clock/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/clock/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/clock/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/clock/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/clock/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/clock
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/clock
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/clock/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/clock/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/clock/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/clock/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/clock/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/clock/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/colors/Makefile.in
 +++ doc/kcontrol/colors/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/colors
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/colors
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/colors/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/colors/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/colors/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/colors/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/colors/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/colors
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/colors/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/colors/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/colors/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/colors/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/colors/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/colors/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/colors
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/colors
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/colors/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/colors/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/colors/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/colors/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/colors/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/colors/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/cookies/Makefile.in
 +++ doc/kcontrol/cookies/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/cookies
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/cookies
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/cookies/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/cookies/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/cookies/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/cookies/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/cookies/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cookies
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cookies/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cookies/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cookies/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cookies/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cookies/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cookies/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cookies
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cookies
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cookies/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cookies/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/cookies/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/cookies/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/cookies/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/cookies/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/crypto/Makefile.in
 +++ doc/kcontrol/crypto/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/crypto
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/crypto
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/crypto/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/crypto/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/crypto/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/crypto/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/crypto/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/crypto
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/crypto/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/crypto/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/crypto/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/crypto/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/crypto/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/crypto/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/crypto
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/crypto
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/crypto/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/crypto/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/crypto/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/crypto/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/crypto/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/crypto/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/desktop/Makefile.in
 +++ doc/kcontrol/desktop/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/desktop
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/desktop
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/desktop/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/desktop/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/desktop/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/desktop/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/desktop/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktop
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktop/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktop/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktop/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktop/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktop/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktop/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktop
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktop
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktop/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktop/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktop/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/desktop/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/desktop/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/desktop/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/desktopbehavior/Makefile.in
 +++ doc/kcontrol/desktopbehavior/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/desktopbehavior
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/desktopbehavior
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/desktopbehavior/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/desktopbehavior/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/desktopbehavior/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/desktopbehavior/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/desktopbehavior/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktopbehavior
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktopbehavior/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktopbehavior/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktopbehavior/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktopbehavior/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktopbehavior/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktopbehavior/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktopbehavior
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktopbehavior
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktopbehavior/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktopbehavior/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/desktopbehavior/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/desktopbehavior/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/desktopbehavior/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/desktopbehavior/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/ebrowsing/Makefile.in
 +++ doc/kcontrol/ebrowsing/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/ebrowsing
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/ebrowsing
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/ebrowsing/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/ebrowsing/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/ebrowsing/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/ebrowsing/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/ebrowsing/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/ebrowsing
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/ebrowsing/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/ebrowsing/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/ebrowsing/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/ebrowsing/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/ebrowsing/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/ebrowsing/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/ebrowsing
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/ebrowsing
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/ebrowsing/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/ebrowsing/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/ebrowsing/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/ebrowsing/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/ebrowsing/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/ebrowsing/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/email/Makefile.in
 +++ doc/kcontrol/email/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/email
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/email
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/email/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/email/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/email/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/email/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/email/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/email
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/email/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/email/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/email/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/email/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/email/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/email/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/email
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/email
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/email/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/email/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/email/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/email/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/email/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/email/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/energy/Makefile.in
 +++ doc/kcontrol/energy/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/energy
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/energy
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/energy/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/energy/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/energy/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/energy/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/energy/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/energy
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/energy/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/energy/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/energy/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/energy/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/energy/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/energy/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/energy
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/energy
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/energy/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/energy/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/energy/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/energy/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/energy/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/energy/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/filemanager/Makefile.in
 +++ doc/kcontrol/filemanager/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/filemanager
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/filemanager
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/filemanager/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/filemanager/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/filemanager/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/filemanager/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/filemanager/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=kfileman1.png index.docbook Makefile.in kfileman2.png Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kfileman1.png kfileman2.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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager
-+	@for base in index.docbook kfileman1.png kfileman2.png ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook kfileman1.png kfileman2.png ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook kfileman1.png kfileman2.png ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/filemanager/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/filemanager/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/filemanager/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/filetypes/Makefile.in
 +++ doc/kcontrol/filetypes/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/filetypes
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/filetypes
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/filetypes/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/filetypes/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/filetypes/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/filetypes/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/filetypes/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filetypes
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filetypes/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filetypes/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filetypes/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filetypes/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filetypes/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filetypes/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filetypes
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filetypes
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filetypes/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filetypes/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filetypes/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/filetypes/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/filetypes/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/filetypes/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/fonts/Makefile.in
 +++ doc/kcontrol/fonts/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/fonts
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/fonts
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/fonts/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/fonts/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/fonts/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/fonts/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/fonts/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/fonts
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/fonts/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/fonts/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/fonts/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/fonts/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/fonts/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/fonts/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/fonts
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/fonts
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/fonts/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/fonts/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/fonts/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/fonts/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/fonts/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/fonts/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/helpindex/Makefile.in
 +++ doc/kcontrol/helpindex/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/helpindex
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/helpindex.html
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/helpindex/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/helpindex/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/helpindex/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/helpindex/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/helpindex/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/helpindex.html
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/helpindex.html/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/helpindex.html/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/helpindex.html/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/helpindex.html/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/helpindex.html/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/helpindex.html/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/helpindex.html
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/helpindex.html
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/helpindex.html/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/helpindex.html/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/helpindex.html/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/helpindex/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/helpindex/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/helpindex/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/icons/Makefile.in
 +++ doc/kcontrol/icons/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/icons
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/icons
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/icons/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/icons/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/icons/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/icons/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/icons/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/icons
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/icons/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/icons/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/icons/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/icons/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/icons/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/icons/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/icons
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/icons
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/icons/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/icons/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/icons/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/icons/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/icons/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/icons/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/kcmaccess/Makefile.in
 +++ doc/kcontrol/kcmaccess/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/kcmaccess
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/kcmaccess
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmaccess/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmaccess/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmaccess/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmaccess/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/kcmaccess/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmaccess
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmaccess/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmaccess/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmaccess/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmaccess/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmaccess/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmaccess/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmaccess
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmaccess
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmaccess/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmaccess/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmaccess/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmaccess/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmaccess/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/kcmaccess/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/kcmcss/Makefile.in
 +++ doc/kcontrol/kcmcss/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/kcmcss
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/kcmcss
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmcss/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmcss/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmcss/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmcss/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/kcmcss/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmcss
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmcss/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmcss/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmcss/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmcss/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmcss/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmcss/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmcss
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmcss
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmcss/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmcss/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmcss/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmcss/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmcss/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/kcmcss/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/kcmfontinst/Makefile.in
 +++ doc/kcontrol/kcmfontinst/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/kcmfontinst
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/kcmfontinst
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmfontinst/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmfontinst/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmfontinst/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmfontinst/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/kcmfontinst/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmfontinst
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmfontinst/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmfontinst/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmfontinst/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmfontinst/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmfontinst/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmfontinst/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmfontinst
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmfontinst
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmfontinst/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmfontinst/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmfontinst/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmfontinst/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmfontinst/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/kcmfontinst/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/kcmkonsole/Makefile.in
 +++ doc/kcontrol/kcmkonsole/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/kcmkonsole
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/kcmkonsole
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmkonsole/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmkonsole/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmkonsole/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmkonsole/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/kcmkonsole/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmkonsole
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmkonsole/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmkonsole/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmkonsole/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmkonsole/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmkonsole/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmkonsole/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmkonsole
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmkonsole
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmkonsole/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmkonsole/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmkonsole/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmkonsole/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmkonsole/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/kcmkonsole/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/kcmlaunch/Makefile.in
 +++ doc/kcontrol/kcmlaunch/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/kcmlaunch
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/kcmlaunch
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmlaunch/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmlaunch/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmlaunch/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmlaunch/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/kcmlaunch/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-libtool mostlyclean-am
-+#>+ 1
-+clean-am: clean-docs clean-bcheck  clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am:
-+#>+ 1
-+install-data-am: install-docs install-nls 
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-+	distclean distclean-generic distclean-libtool distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 2
-+KDE_DIST=index.docbook Makefile.in Makefile.am 
-+
-+#>+ 24
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) 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
-+
-+install-docs: docs-am install-nls
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmlaunch
-+	@if test -f index.cache.bz2; then \
-+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmlaunch/; \
-+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmlaunch/; \
-+	elif test -f  $(srcdir)/index.cache.bz2; then \
-+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmlaunch/; \
-+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmlaunch/; \
-+	fi
-+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmlaunch/common
-+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmlaunch/common
-+
-+uninstall-docs:
-+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmlaunch
-+
-+clean-docs:
-+	-rm -f index.cache.bz2
-+
-+
-+#>+ 13
-+install-nls:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmlaunch
-+	@for base in index.docbook ; do \
-+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmlaunch/$$base ;\
-+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmlaunch/$$base ;\
-+	done
-+
-+uninstall-nls:
-+	for base in index.docbook ; do \
-+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kcmlaunch/$$base ;\
-+	done
-+
-+
-+#>+ 5
-+distdir-nls:
-+	for file in index.docbook ; do \
-+	  cp $(srcdir)/$$file $(distdir); \
-+	done
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmlaunch/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmlaunch/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/kcmlaunch/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 3
-+final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 3
-+nmcheck: 
-+nmcheck-am: nmcheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/kcontrol/kcmnotify/Makefile.in
 +++ doc/kcontrol/kcmnotify/Makefile.in
-@@ -0,0 +1,847 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = doc/kcontrol/kcmnotify
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -250,6 +251,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -307,12 +312,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -506,6 +512,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -513,10 +520,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+KDE_LANG = en
-+KDE_DOCS = kcontrol/kcmnotify
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmnotify/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmnotify/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcontrol/kcmnotify/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/kcontrol/kcmnotify/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit doc/kcontrol/kcmnotify/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -581,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+#>- distdir: $(DISTFILES)
-+#>+ 1
-+distdir: distdir-nls  $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+#>- uninstall: uninstall-am
-+#>+ 1
-+uninstall: uninstall-docs uninstall-nls  uninsta