rev 4431 - trunk/packages/kdesdk/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Sun Aug 27 02:52:48 UTC 2006


Author: chrsmrtn
Date: 2006-08-27 02:52:38 +0000 (Sun, 27 Aug 2006)
New Revision: 4431

Modified:
   trunk/packages/kdesdk/debian/patches/98_buildprep.diff
Log:
And once again update the buildprep.


Modified: trunk/packages/kdesdk/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdesdk/debian/patches/98_buildprep.diff	2006-08-27 02:49:02 UTC (rev 4430)
+++ trunk/packages/kdesdk/debian/patches/98_buildprep.diff	2006-08-27 02:52:38 UTC (rev 4431)
@@ -4475,7 +4475,7 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.60.
++# Generated by GNU Autoconf 2.60a.
  #
 -# Copyright (C) 2003 Free Software Foundation, Inc.
 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -5165,19 +5165,53 @@
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -455,17 +745,345 @@
+@@ -430,42 +720,370 @@
+ # 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
- #if HAVE_INTTYPES_H
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ #  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
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
  # 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
-+#if HAVE_STDINT_H
-+# include <stdint.h>
- #endif
- #if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
  
@@ -5428,8 +5462,8 @@
 +LIB_KFILE
 +LIB_KFM
 +LEX
++LEX_OUTPUT_ROOT
 +LEXLIB
-+LEX_OUTPUT_ROOT
 +DBIV_INCLUDES
 +DBIV_LDFLAGS
 +DBIV_NAME
@@ -5715,9 +5749,15 @@
  
 -# Be sure to have absolute paths.
 -for ac_var in exec_prefix prefix
--do
++# Be sure to have absolute directory names.
++for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
++		datadir sysconfdir sharedstatedir localstatedir includedir \
++		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++		libdir localedir mandir
+ do
 -  eval ac_val=$`echo $ac_var`
--  case $ac_val in
++  eval ac_val=\$$ac_var
+   case $ac_val in
 -    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
 -    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
 -   { (exit 1); exit 1; }; };;
@@ -5727,15 +5767,9 @@
 -# 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; }; };;
@@ -6120,7 +6154,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
 +configure
-+generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.60a
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -6139,7 +6173,7 @@
  
  It was created by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.60a.  Invocation command line was
  
    $ $0 $@
  
@@ -7587,7 +7621,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -2821,46 +3547,70 @@
+@@ -2821,47 +3547,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.
@@ -7641,7 +7675,7 @@
 +# 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
++for ac_file in $ac_files ''
  do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -7678,16 +7712,21 @@
 +test "$ac_cv_exeext" = no && ac_cv_exeext=
 +
  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
-@@ -2873,19 +3623,23 @@
+ 
+@@ -2873,19 +3629,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
 -echo "$as_me:$LINENO: result: $ac_file" >&5
 -echo "${ECHO_T}$ac_file" >&6
-+{ 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
@@ -7711,7 +7750,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -2904,22 +3658,27 @@
+@@ -2904,22 +3662,27 @@
      fi
    fi
  fi
@@ -7751,7 +7790,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -2930,9 +3689,8 @@
+@@ -2930,9 +3693,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -7762,7 +7801,7 @@
  	  break;;
      * ) break;;
    esac
-@@ -2946,14 +3704,14 @@
+@@ -2946,14 +3708,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -7781,7 +7820,7 @@
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2973,14 +3731,20 @@
+@@ -2973,14 +3735,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -7806,7 +7845,7 @@
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -2998,12 +3762,12 @@
+@@ -2998,12 +3766,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -7823,7 +7862,7 @@
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3026,24 +3790,36 @@
+@@ -3026,24 +3794,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7868,7 +7907,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3052,24 +3828,28 @@
+@@ -3052,24 +3832,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7905,7 +7944,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3085,24 +3865,147 @@
+@@ -3085,24 +3869,147 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8061,20 +8100,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3111,12 +4014,20 @@
+@@ -3111,12 +4018,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_prog_cc_g=no
 +
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_c_werror_flag=$ac_save_c_werror_flag
@@ -8086,7 +8125,7 @@
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -3132,12 +4043,12 @@
+@@ -3132,12 +4047,12 @@
      CFLAGS=
    fi
  fi
@@ -8103,7 +8142,7 @@
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3171,12 +4082,17 @@
+@@ -3171,12 +4086,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
@@ -8123,7 +8162,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -3191,205 +4107,74 @@
+@@ -3191,205 +4111,74 @@
    return 0;
  }
  _ACEOF
@@ -8368,7 +8407,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3398,8 +4183,8 @@
+@@ -3398,8 +4187,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -8379,7 +8418,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3488,8 +4273,8 @@
+@@ -3488,8 +4277,8 @@
  fi
  
  fi
@@ -8390,7 +8429,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3511,8 +4296,8 @@
+@@ -3511,8 +4300,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
@@ -8401,7 +8440,7 @@
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -3546,8 +4331,13 @@
+@@ -3546,8 +4335,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -8417,7 +8456,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3572,9 +4362,10 @@
+@@ -3572,9 +4366,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -8429,7 +8468,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3584,8 +4375,13 @@
+@@ -3584,8 +4379,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -8445,7 +8484,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3612,6 +4408,7 @@
+@@ -3612,6 +4412,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -8453,7 +8492,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3629,8 +4426,8 @@
+@@ -3629,8 +4430,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -8464,7 +8503,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3653,8 +4450,13 @@
+@@ -3653,8 +4454,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -8480,7 +8519,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3679,9 +4481,10 @@
+@@ -3679,9 +4485,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -8492,7 +8531,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3691,8 +4494,13 @@
+@@ -3691,8 +4498,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -8508,7 +8547,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3719,6 +4527,7 @@
+@@ -3719,6 +4531,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -8516,7 +8555,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3769,18 +4578,22 @@
+@@ -3769,18 +4582,22 @@
  
    CXXFLAGS=" $CXXFLAGS"
  
@@ -8544,7 +8583,7 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3793,36 +4606,38 @@
+@@ -3793,36 +4610,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8591,7 +8630,7 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3835,55 +4650,85 @@
+@@ -3835,55 +4654,85 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8695,7 +8734,7 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3906,24 +4751,36 @@
+@@ -3906,24 +4755,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8740,7 +8779,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3932,24 +4789,28 @@
+@@ -3932,24 +4793,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8777,7 +8816,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3965,24 +4826,36 @@
+@@ -3965,24 +4830,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8822,7 +8861,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3991,70 +4864,53 @@
+@@ -3991,70 +4868,53 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8917,7 +8956,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4063,61 +4919,91 @@
+@@ -4063,61 +4923,91 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9031,7 +9070,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4126,8 +5012,8 @@
+@@ -4126,8 +5016,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -9042,7 +9081,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4216,8 +5102,8 @@
+@@ -4216,8 +5106,8 @@
  fi
  
  fi
@@ -9053,7 +9092,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -4235,8 +5121,8 @@
+@@ -4235,8 +5125,8 @@
  
  
  
@@ -9064,7 +9103,7 @@
  
  
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4261,24 +5147,36 @@
+@@ -4261,24 +5151,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9109,7 +9148,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4287,13 +5185,14 @@
+@@ -4287,13 +5189,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9128,7 +9167,7 @@
  
  if test "$kde_bad_compiler" = "yes"; then
    { { echo "$as_me:$LINENO: error:
-@@ -4335,17 +5234,16 @@
+@@ -4335,17 +5238,16 @@
          fi
        fi
  
@@ -9150,7 +9189,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4373,24 +5271,36 @@
+@@ -4373,24 +5275,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9195,7 +9234,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4399,8 +5309,10 @@
+@@ -4399,8 +5313,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9203,11 +9242,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4413,29 +5325,28 @@
+@@ -4413,29 +5329,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9245,7 +9284,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4462,24 +5373,36 @@
+@@ -4462,24 +5377,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9290,7 +9329,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4488,8 +5411,10 @@
+@@ -4488,8 +5415,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9298,11 +9337,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4502,13 +5427,13 @@
+@@ -4502,13 +5431,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9320,7 +9359,7 @@
   :
   WOVERLOADED_VRITUAL=""
  fi
-@@ -4529,16 +5454,15 @@
+@@ -4529,16 +5458,15 @@
  
    if test "$kde_use_profiling" = "yes"; then
  
@@ -9341,7 +9380,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4565,24 +5489,36 @@
+@@ -4565,24 +5493,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9386,7 +9425,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4591,8 +5527,10 @@
+@@ -4591,8 +5531,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9394,11 +9433,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4605,16 +5543,16 @@
+@@ -4605,16 +5547,16 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9419,7 +9458,7 @@
   :
  
  fi
-@@ -4629,16 +5567,15 @@
+@@ -4629,16 +5571,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"
  
@@ -9440,7 +9479,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4665,24 +5602,36 @@
+@@ -4665,24 +5606,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9485,7 +9524,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4691,8 +5640,10 @@
+@@ -4691,8 +5644,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9493,11 +9532,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4705,27 +5656,26 @@
+@@ -4705,27 +5660,26 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9532,7 +9571,7 @@
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4750,24 +5700,36 @@
+@@ -4750,24 +5704,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9577,7 +9616,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4776,8 +5738,10 @@
+@@ -4776,8 +5742,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9585,11 +9624,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CFLAGS="$save_CFLAGS"
    ac_ext=c
-@@ -4790,13 +5754,13 @@
+@@ -4790,13 +5758,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9607,7 +9646,7 @@
   :
  
  fi
-@@ -4804,16 +5768,15 @@
+@@ -4804,16 +5772,15 @@
            ;;
          esac
  
@@ -9628,7 +9667,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4840,24 +5803,36 @@
+@@ -4840,24 +5807,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9673,7 +9712,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4866,8 +5841,10 @@
+@@ -4866,8 +5845,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9681,11 +9720,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4880,28 +5857,27 @@
+@@ -4880,28 +5861,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9722,7 +9761,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4928,24 +5904,36 @@
+@@ -4928,24 +5908,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9767,7 +9806,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4954,8 +5942,10 @@
+@@ -4954,8 +5946,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9775,11 +9814,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4968,28 +5958,27 @@
+@@ -4968,28 +5962,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9816,7 +9855,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5016,24 +6005,36 @@
+@@ -5016,24 +6009,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9861,7 +9900,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5042,8 +6043,10 @@
+@@ -5042,8 +6047,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9869,11 +9908,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5056,13 +6059,13 @@
+@@ -5056,13 +6063,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9891,7 +9930,7 @@
   :
  
  fi
-@@ -5074,13 +6077,13 @@
+@@ -5074,13 +6081,13 @@
      CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
    fi
  
@@ -9909,7 +9948,7 @@
  
    HAVE_GCC_VISIBILITY=0
  
-@@ -5088,16 +6091,15 @@
+@@ -5088,16 +6095,15 @@
    if test "$GXX" = "yes"; then
      gcc_no_reorder_blocks=NO
  
@@ -9930,7 +9969,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5124,24 +6126,36 @@
+@@ -5124,24 +6130,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9975,7 +10014,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5150,8 +6164,10 @@
+@@ -5150,8 +6168,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9983,11 +10022,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5164,13 +6180,13 @@
+@@ -5164,13 +6184,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10005,7 +10044,7 @@
   :
  
  fi
-@@ -5182,16 +6198,15 @@
+@@ -5182,16 +6202,15 @@
            CFLAGS="$CFLAGS -fno-reorder-blocks"
      fi
  
@@ -10026,7 +10065,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5218,24 +6233,36 @@
+@@ -5218,24 +6237,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10071,7 +10110,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5244,8 +6271,10 @@
+@@ -5244,8 +6275,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10079,11 +10118,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5258,28 +6287,27 @@
+@@ -5258,28 +6291,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10120,7 +10159,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5306,24 +6334,36 @@
+@@ -5306,24 +6338,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10165,7 +10204,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5332,8 +6372,10 @@
+@@ -5332,8 +6376,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10173,11 +10212,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5346,28 +6388,27 @@
+@@ -5346,28 +6392,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10214,7 +10253,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5394,24 +6435,36 @@
+@@ -5394,24 +6439,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10259,7 +10298,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5420,8 +6473,10 @@
+@@ -5420,8 +6477,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10267,11 +10306,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5434,28 +6489,27 @@
+@@ -5434,28 +6493,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10308,7 +10347,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5482,24 +6536,36 @@
+@@ -5482,24 +6540,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10353,7 +10392,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5508,8 +6574,10 @@
+@@ -5508,8 +6578,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10361,11 +10400,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5522,13 +6590,13 @@
+@@ -5522,13 +6594,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10383,7 +10422,7 @@
   :
   USE_EXCEPTIONS=
  fi
-@@ -5536,37 +6604,37 @@
+@@ -5536,37 +6608,37 @@
      ENABLE_PERMISSIVE_FLAG="-fpermissive"
  
      if test "$kde_use_pch" = "yes"; then
@@ -10435,7 +10474,7 @@
  if test "${kde_cv_opt_noinline_match+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5598,24 +6666,36 @@
+@@ -5598,24 +6670,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10480,7 +10519,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5624,18 +6704,19 @@
+@@ -5624,18 +6708,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10490,7 +10529,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
      CFLAGS="$ac_cflags_save"
@@ -10504,7 +10543,7 @@
  
      if test "x$kde_cv_opt_noinline_match" = "xno" ; then
         CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5655,16 +6736,15 @@
+@@ -5655,16 +6740,15 @@
  
      if test "$kde_use_pch" = "yes"; then
  
@@ -10525,7 +10564,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5691,24 +6771,36 @@
+@@ -5691,24 +6775,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10570,7 +10609,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5717,8 +6809,10 @@
+@@ -5717,8 +6813,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10578,11 +10617,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5731,29 +6825,28 @@
+@@ -5731,29 +6829,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10620,7 +10659,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5780,24 +6873,36 @@
+@@ -5780,24 +6877,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10665,7 +10704,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5806,8 +6911,10 @@
+@@ -5806,8 +6915,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10673,11 +10712,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5820,28 +6927,27 @@
+@@ -5820,28 +6931,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10714,7 +10753,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5868,24 +6974,36 @@
+@@ -5868,24 +6978,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10759,7 +10798,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5894,8 +7012,10 @@
+@@ -5894,8 +7016,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10767,11 +10806,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5908,28 +7028,27 @@
+@@ -5908,28 +7032,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10808,7 +10847,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5956,24 +7075,36 @@
+@@ -5956,24 +7079,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10853,7 +10892,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5982,8 +7113,10 @@
+@@ -5982,8 +7117,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10861,11 +10900,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5996,28 +7129,27 @@
+@@ -5996,28 +7133,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10902,7 +10941,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6044,24 +7176,36 @@
+@@ -6044,24 +7180,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10947,7 +10986,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6070,8 +7214,10 @@
+@@ -6070,8 +7218,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10955,11 +10994,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6084,28 +7230,27 @@
+@@ -6084,28 +7234,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10996,7 +11035,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6132,24 +7277,36 @@
+@@ -6132,24 +7281,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11041,7 +11080,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6158,8 +7315,10 @@
+@@ -6158,8 +7319,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11049,11 +11088,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6172,13 +7331,13 @@
+@@ -6172,13 +7335,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11071,7 +11110,7 @@
   :
  
  fi
-@@ -6285,13 +7444,13 @@
+@@ -6285,13 +7448,13 @@
  fi
  
  
@@ -11088,7 +11127,7 @@
  if test -z "$CXXCPP"; then
    if test "${ac_cv_prog_CXXCPP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6321,8 +7480,13 @@
+@@ -6321,8 +7484,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -11104,7 +11143,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6347,9 +7511,10 @@
+@@ -6347,9 +7515,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -11116,7 +11155,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6359,8 +7524,13 @@
+@@ -6359,8 +7528,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -11132,7 +11171,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6387,6 +7557,7 @@
+@@ -6387,6 +7561,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -11140,7 +11179,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6404,8 +7575,8 @@
+@@ -6404,8 +7579,8 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -11151,7 +11190,7 @@
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
  do
-@@ -6428,8 +7599,13 @@
+@@ -6428,8 +7603,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -11167,7 +11206,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6454,9 +7630,10 @@
+@@ -6454,9 +7634,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -11179,7 +11218,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6466,8 +7643,13 @@
+@@ -6466,8 +7647,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -11195,7 +11234,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6494,6 +7676,7 @@
+@@ -6494,6 +7680,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -11203,7 +11242,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6520,16 +7703,15 @@
+@@ -6520,16 +7707,15 @@
       NOOPT_CFLAGS=-O0
    fi
  
@@ -11224,7 +11263,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6556,24 +7738,36 @@
+@@ -6556,24 +7742,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11269,7 +11308,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6582,8 +7776,10 @@
+@@ -6582,8 +7780,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11277,11 +11316,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6596,22 +7792,21 @@
+@@ -6596,22 +7796,21 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11310,7 +11349,7 @@
        if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
          ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
          ac_coverage_linker="-lgcc"
-@@ -6627,36 +7822,36 @@
+@@ -6627,36 +7826,36 @@
        CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
        LDFLAGS="$LDFLAGS $ac_coverage_linker"
  
@@ -11357,7 +11396,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6683,24 +7878,36 @@
+@@ -6683,24 +7882,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11402,7 +11441,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6709,8 +7916,10 @@
+@@ -6709,8 +7920,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11410,11 +11449,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6723,29 +7932,28 @@
+@@ -6723,29 +7936,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11452,7 +11491,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6772,24 +7980,36 @@
+@@ -6772,24 +7984,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11497,7 +11536,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6798,8 +8018,10 @@
+@@ -6798,8 +8022,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11505,11 +11544,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6812,13 +8034,13 @@
+@@ -6812,13 +8038,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11527,7 +11566,7 @@
   :
  
  fi
-@@ -6828,13 +8050,13 @@
+@@ -6828,13 +8054,13 @@
  
  
  
@@ -11545,7 +11584,7 @@
  
    if test "x$kde_use_final" = "xyes"; then
        KDE_USE_FINAL_TRUE=""
-@@ -6847,13 +8069,13 @@
+@@ -6847,13 +8073,13 @@
  
  
  
@@ -11563,7 +11602,7 @@
  
    KDE_NO_UNDEFINED=""
    if test "x$kde_use_closure" = "xyes"; then
-@@ -6864,278 +8086,99 @@
+@@ -6864,272 +8090,93 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -11610,7 +11649,6 @@
 +      KDE_USE_NMCHECK_TRUE="#"
 +      KDE_USE_NMCHECK_FALSE=""
 +  fi
-+
  
 -int
 -main ()
@@ -11659,6 +11697,7 @@
  
  
 +
++
 +# Check whether --enable-shared was given.
 +if test "${enable_shared+set}" = set; then
 +  enableval=$enable_shared; p=${PACKAGE-default}
@@ -11742,7 +11781,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
- 
+-
 -int
 -main ()
 -{
@@ -11899,21 +11938,10 @@
 -  enableval="$enable_libsuffix"
 -  kdelibsuff=$enableval
 -fi;
--
--    if test "$kdelibsuff" = "auto"; then
--
--cat > conftest.c << EOF
--#include <stdio.h>
--int main() {
-+    if test "$kdelibsuff" = "auto"; then
-+
-+cat > conftest.c << EOF
-+#include <stdio.h>
-+int main() {
-  return 0;
- }
- EOF
-@@ -7150,8 +8193,8 @@
+ 
+     if test "$kdelibsuff" = "auto"; then
+ 
+@@ -7150,8 +8197,8 @@
         kdelibsuff=
      fi
      if test -z "$kdelibsuff"; then
@@ -11924,7 +11952,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define KDELIBSUFF ""
-@@ -7167,14 +8210,13 @@
+@@ -7167,14 +8214,13 @@
  #define KDELIBSUFF "${kdelibsuff}"
  _ACEOF
  
@@ -11943,22 +11971,22 @@
      case $enableval in
      yes) enable_fast_install=yes ;;
      no) enable_fast_install=no ;;
-@@ -7193,10 +8235,11 @@
+@@ -7193,10 +8239,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
-@@ -7220,7 +8263,7 @@
+@@ -7220,7 +8267,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
@@ -11967,7 +11995,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7249,37 +8292,184 @@
+@@ -7249,37 +8296,184 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -12053,19 +12081,16 @@
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
-+
  
 -echo "$as_me:$LINENO: checking for egrep" >&5
 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 -if test "${ac_cv_prog_egrep+set}" = set; then
++
 +{ echo "$as_me:$LINENO: checking for egrep" >&5
 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
 +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
 +   then ac_cv_path_EGREP="$GREP -E"
 +   else
@@ -12073,8 +12098,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
@@ -12130,25 +12158,25 @@
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
-+fi
-+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+ 
 +else
 +  ac_cv_path_EGREP=$EGREP
 +fi
 +
 +
 +   fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
  
  
- 
 -# Check whether --with-gnu-ld or --without-gnu-ld was given.
++
 +# Check whether --with-gnu-ld was given.
  if test "${with_gnu_ld+set}" = set; then
 -  withval="$with_gnu_ld"
@@ -12169,7 +12197,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -7308,11 +8498,11 @@
+@@ -7308,11 +8502,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -12185,7 +12213,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7325,7 +8515,7 @@
+@@ -7325,7 +8519,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,
@@ -12194,7 +12222,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -7345,21 +8535,21 @@
+@@ -7345,21 +8539,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -12223,7 +12251,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7369,29 +8559,38 @@
+@@ -7369,29 +8563,38 @@
    ;;
  esac
  fi
@@ -12270,7 +12298,7 @@
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7399,56 +8598,63 @@
+@@ -7399,56 +8602,63 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -12368,7 +12396,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7475,44 +8681,36 @@
+@@ -7475,44 +8685,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -12423,7 +12451,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7528,7 +8726,7 @@
+@@ -7528,7 +8730,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -12432,7 +12460,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7544,43 +8742,27 @@
+@@ -7544,43 +8746,27 @@
    esac
    ;;
  
@@ -12489,7 +12517,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -7599,32 +8781,22 @@
+@@ -7599,32 +8785,22 @@
    ;;
  
  openbsd*)
@@ -12525,7 +12553,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7645,17 +8817,20 @@
+@@ -7645,17 +8821,20 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -12549,7 +12577,7 @@
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7664,14 +8839,17 @@
+@@ -7664,14 +8843,17 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -12570,16 +12598,16 @@
  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
  # Some flags need to be propagated to the compiler or linker for good
-@@ -7698,7 +8876,7 @@
+@@ -7698,7 +8880,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 7701 "configure"' > conftest.$ac_ext
-+  echo '#line 8879 "configure"' > conftest.$ac_ext
++  echo '#line 8883 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7741,14 +8919,13 @@
+@@ -7741,14 +8923,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -12596,7 +12624,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7760,7 +8937,6 @@
+@@ -7760,7 +8941,6 @@
        esac
        ;;
      *64-bit*)
@@ -12604,7 +12632,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7785,8 +8961,8 @@
+@@ -7785,8 +8965,8 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -12615,7 +12643,7 @@
  if test "${lt_cv_cc_needs_belf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7812,24 +8988,36 @@
+@@ -7812,24 +8992,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12660,7 +12688,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7838,9 +9026,10 @@
+@@ -7838,9 +9030,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12669,11 +12697,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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'
-@@ -7849,22 +9038,42 @@
+@@ -7849,25 +9042,45 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -12689,6 +12717,15 @@
 -
 -esac
 -
+-need_locks="$enable_libtool_lock"
+-
+-
+-
+-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
 +sparc*-*solaris*)
 +  # Find out which ABI we are using.
 +  echo 'int i;' > conftest.$ac_ext
@@ -12712,18 +12749,19 @@
 +
 +esac
 +
- need_locks="$enable_libtool_lock"
- 
- 
- 
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++need_locks="$enable_libtool_lock"
++
++
++
 +{ 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
-@@ -7888,24 +9097,36 @@
++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
+@@ -7888,24 +9101,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12768,7 +12806,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7914,9 +9135,10 @@
+@@ -7914,9 +9139,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12781,7 +12819,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7972,6 +9194,7 @@
+@@ -7972,6 +9198,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -12789,7 +12827,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7991,18 +9214,27 @@
+@@ -7991,18 +9218,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -12823,7 +12861,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8015,12 +9247,14 @@
+@@ -8015,12 +9251,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -12841,7 +12879,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8043,9 +9277,9 @@
+@@ -8043,9 +9281,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12854,7 +12892,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8059,24 +9293,36 @@
+@@ -8059,24 +9297,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12899,7 +12937,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8085,12 +9331,14 @@
+@@ -8085,12 +9335,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12918,7 +12956,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8105,18 +9353,19 @@
+@@ -8105,18 +9357,19 @@
  for ac_header in dlfcn.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12946,7 +12984,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8127,24 +9376,36 @@
+@@ -8127,24 +9380,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12991,7 +13029,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8153,15 +9414,16 @@
+@@ -8153,15 +9418,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13014,7 +13052,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8170,8 +9432,13 @@
+@@ -8170,8 +9436,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -13030,7 +13068,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -8195,9 +9462,10 @@
+@@ -8195,9 +9466,10 @@
  
    ac_header_preproc=no
  fi
@@ -13043,7 +13081,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8221,25 +9489,19 @@
+@@ -8221,25 +9493,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;}
@@ -13076,7 +13114,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8251,364 +9513,746 @@
+@@ -8251,345 +9517,711 @@
  
  done
  
@@ -13377,14 +13415,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
-+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
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
 -if test "$ac_test_FFLAGS" = set; then
@@ -13395,7 +13426,15 @@
 -  else
 -    FFLAGS="-g"
 -  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
 +
@@ -13729,15 +13768,6 @@
 -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'"
 +# Provide some information about the compiler.
 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
 +ac_compiler=`set X $ac_compile; echo $2`
@@ -14073,15 +14103,11 @@
 +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'"
+   ;;
+ cygwin* | mingw* | pw32*)
+   symcode='[ABCDGISTW]'
+@@ -8601,14 +10233,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)
@@ -14113,7 +14139,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8626,14 +10270,17 @@
+@@ -8626,14 +10274,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -14133,7 +14159,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8751,15 +10398,15 @@
+@@ -8751,15 +10402,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
@@ -14155,7 +14181,7 @@
  if test "${lt_cv_objdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8773,8 +10420,8 @@
+@@ -8773,8 +10424,8 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -14166,7 +14192,7 @@
  objdir=$lt_cv_objdir
  
  
-@@ -8795,7 +10442,7 @@
+@@ -8795,7 +10446,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -14175,7 +14201,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8815,7 +10462,7 @@
+@@ -8815,7 +10466,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -14184,7 +14210,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8825,8 +10472,8 @@
+@@ -8825,8 +10476,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
@@ -14195,7 +14221,7 @@
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8839,32 +10486,34 @@
+@@ -8839,32 +10490,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14237,7 +14263,7 @@
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8877,27 +10526,41 @@
+@@ -8877,27 +10530,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14286,7 +14312,7 @@
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -8905,8 +10568,8 @@
+@@ -8905,8 +10572,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
@@ -14297,7 +14323,7 @@
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8919,32 +10582,34 @@
+@@ -8919,32 +10586,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14339,7 +14365,7 @@
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8957,27 +10622,41 @@
+@@ -8957,27 +10626,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14388,7 +14414,7 @@
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -8985,8 +10664,8 @@
+@@ -8985,8 +10668,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
@@ -14399,7 +14425,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8999,32 +10678,34 @@
+@@ -8999,32 +10682,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14441,7 +14467,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9037,27 +10718,41 @@
+@@ -9037,27 +10722,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14490,7 +14516,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -9072,6 +10767,7 @@
+@@ -9072,6 +10771,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -14498,7 +14524,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -9091,21 +10787,32 @@
+@@ -9091,21 +10791,32 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -14535,7 +14561,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9125,7 +10832,7 @@
+@@ -9125,7 +10836,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -14544,7 +14570,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9157,17 +10864,17 @@
+@@ -9157,17 +10868,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -14568,7 +14594,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9187,7 +10894,7 @@
+@@ -9187,7 +10898,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -14577,7 +14603,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9219,11 +10926,11 @@
+@@ -9219,11 +10930,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -14593,7 +14619,7 @@
  fi
  
    else
-@@ -9238,21 +10945,21 @@
+@@ -9238,21 +10949,21 @@
  enable_dlopen=yes
  enable_win32_dll=no
  
@@ -14622,7 +14648,7 @@
  test -z "$pic_mode" && pic_mode=default
  
  # Use C for the default configuration in the libtool script
-@@ -9282,68 +10989,25 @@
+@@ -9282,68 +10993,25 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -14706,7 +14732,7 @@
  
  
  ## CAVEAT EMPTOR:
-@@ -9357,8 +11021,8 @@
+@@ -9357,8 +11025,8 @@
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
  
@@ -14717,7 +14743,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9372,26 +11036,28 @@
+@@ -9372,26 +11040,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 \
@@ -14726,12 +14752,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9378: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11042: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11046: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9382: \$? = $ac_status" >&5
-+   echo "$as_me:11046: \$? = $ac_status" >&5
++   echo "$as_me:11050: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -14753,7 +14779,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9405,8 +11071,8 @@
+@@ -9405,8 +11075,8 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -14764,7 +14790,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -9444,6 +11110,11 @@
+@@ -9444,6 +11114,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -14776,7 +14802,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9460,7 +11131,7 @@
+@@ -9460,7 +11135,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -14785,7 +14811,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9486,6 +11157,16 @@
+@@ -9486,6 +11161,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -14802,7 +14828,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9497,7 +11178,7 @@
+@@ -9497,7 +11182,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.
@@ -14811,7 +14837,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9520,13 +11201,20 @@
+@@ -9520,13 +11205,20 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14834,7 +14860,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9541,15 +11229,15 @@
+@@ -9541,15 +11233,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -14856,7 +14882,7 @@
        ;;
  
      sunos4*)
-@@ -9558,7 +11246,7 @@
+@@ -9558,7 +11250,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14865,7 +14891,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9571,6 +11259,17 @@
+@@ -9571,6 +11263,17 @@
        fi
        ;;
  
@@ -14883,7 +14909,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9582,16 +11281,16 @@
+@@ -9582,16 +11285,16 @@
      esac
    fi
  
@@ -14904,7 +14930,7 @@
  if test "${lt_prog_compiler_pic_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9605,26 +11304,28 @@
+@@ -9605,26 +11308,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 \
@@ -14913,12 +14939,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9611: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11310: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11314: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9615: \$? = $ac_status" >&5
-+   echo "$as_me:11314: \$? = $ac_status" >&5
++   echo "$as_me:11318: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -14940,7 +14966,7 @@
  
  if test x"$lt_prog_compiler_pic_works" = xyes; then
      case $lt_prog_compiler_pic in
-@@ -9637,7 +11338,7 @@
+@@ -9637,7 +11342,7 @@
  fi
  
  fi
@@ -14949,7 +14975,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9647,8 +11348,50 @@
+@@ -9647,8 +11352,50 @@
      ;;
  esac
  
@@ -15002,7 +15028,7 @@
  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9659,60 +11402,58 @@
+@@ -9659,60 +11406,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -15024,12 +15050,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9678: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11414: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11418: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9682: \$? = $ac_status" >&5
-+   echo "$as_me:11418: \$? = $ac_status" >&5
++   echo "$as_me:11422: \$? = $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
@@ -15081,7 +15107,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9722,8 +11463,8 @@
+@@ -9722,8 +11467,8 @@
    need_locks=no
  fi
  
@@ -15092,7 +15118,7 @@
  
    runpath_var=
    allow_undefined_flag=
-@@ -9761,6 +11502,16 @@
+@@ -9761,6 +11506,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -15109,7 +15135,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9771,6 +11522,10 @@
+@@ -9771,6 +11526,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -15120,7 +15146,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9781,6 +11536,27 @@
+@@ -9781,6 +11540,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -15148,7 +15174,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9818,7 +11594,7 @@
+@@ -9818,7 +11598,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -15157,7 +15183,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9828,13 +11604,13 @@
+@@ -9828,13 +11608,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'
@@ -15174,18 +15200,17 @@
  	# 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
-@@ -9843,23 +11619,70 @@
+@@ -9843,23 +11623,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
-       fi
-       ;;
- 
--    netbsd*)
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
 +    interix3*)
 +      hardcode_direct=no
 +      hardcode_shlibpath_var=no
@@ -15228,11 +15253,12 @@
 +	  $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'
@@ -15250,7 +15276,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9873,13 +11696,40 @@
+@@ -9873,13 +11700,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15293,7 +15319,7 @@
      sunos4*)
        archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -9889,24 +11739,19 @@
+@@ -9889,24 +11743,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15325,7 +15351,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9918,7 +11763,7 @@
+@@ -9918,7 +11767,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -15334,7 +15360,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9940,9 +11785,21 @@
+@@ -9940,9 +11789,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
@@ -15358,7 +15384,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9959,7 +11816,7 @@
+@@ -9959,7 +11820,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -15367,7 +15393,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -9978,8 +11835,12 @@
+@@ -9978,8 +11839,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -15380,7 +15406,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9987,22 +11848,23 @@
+@@ -9987,22 +11852,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -15411,7 +15437,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10018,24 +11880,36 @@
+@@ -10018,24 +11884,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15456,7 +15482,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10049,19 +11923,20 @@
+@@ -10049,19 +11927,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15464,7 +15490,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++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
  
@@ -15482,7 +15508,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10080,24 +11955,36 @@
+@@ -10080,24 +11959,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15527,7 +15553,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10111,8 +11998,10 @@
+@@ -10111,8 +12002,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15535,11 +15561,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++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
  
-@@ -10121,13 +12010,11 @@
+@@ -10121,13 +12014,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -15556,7 +15582,7 @@
  	fi
        fi
        ;;
-@@ -10140,7 +12027,7 @@
+@@ -10140,7 +12031,7 @@
        ld_shlibs=no
        ;;
  
@@ -15565,7 +15591,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10150,13 +12037,13 @@
+@@ -10150,13 +12041,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -15582,7 +15608,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds='true'
        # FIXME: Should let the user specify the lib program.
-@@ -10166,52 +12053,52 @@
+@@ -10166,52 +12057,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -15675,7 +15701,7 @@
      fi
        ;;
  
-@@ -10245,8 +12132,8 @@
+@@ -10245,8 +12136,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15686,7 +15712,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10254,7 +12141,7 @@
+@@ -10254,7 +12145,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -15695,7 +15721,7 @@
        else
  	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -10268,47 +12155,62 @@
+@@ -10268,47 +12159,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -15782,7 +15808,7 @@
  	  hardcode_direct=yes
  	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10322,7 +12224,7 @@
+@@ -10322,7 +12228,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -15791,7 +15817,7 @@
        else
  	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10332,7 +12234,7 @@
+@@ -10332,7 +12238,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -15800,7 +15826,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10355,7 +12257,8 @@
+@@ -10355,7 +12261,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
@@ -15810,7 +15836,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10365,7 +12268,7 @@
+@@ -10365,7 +12272,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -15819,7 +15845,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10376,14 +12279,14 @@
+@@ -10376,14 +12283,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -15836,7 +15862,7 @@
        else
  	allow_undefined_flag=' -expect_unresolved \*'
  	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10395,13 +12298,13 @@
+@@ -10395,13 +12302,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15852,7 +15878,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10409,21 +12312,15 @@
+@@ -10409,21 +12316,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -15878,7 +15904,7 @@
  	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10432,8 +12329,18 @@
+@@ -10432,8 +12333,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15899,7 +15925,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10442,7 +12349,7 @@
+@@ -10442,7 +12353,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.
@@ -15908,7 +15934,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10490,36 +12397,45 @@
+@@ -10490,36 +12401,45 @@
        fi
        ;;
  
@@ -15975,7 +16001,7 @@
        ;;
  
      uts4*)
-@@ -10534,15 +12450,10 @@
+@@ -10534,15 +12454,10 @@
      esac
    fi
  
@@ -15993,7 +16019,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10560,8 +12471,8 @@
+@@ -10560,8 +12475,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.
@@ -16004,7 +16030,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -10575,6 +12486,7 @@
+@@ -10575,6 +12490,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -16012,7 +16038,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10597,20 +12509,20 @@
+@@ -10597,20 +12513,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -16038,7 +16064,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10620,7 +12532,20 @@
+@@ -10620,7 +12536,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16060,7 +16086,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10685,7 +12610,7 @@
+@@ -10685,7 +12614,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -16069,7 +16095,7 @@
    ;;
  
  beos*)
-@@ -10694,7 +12619,7 @@
+@@ -10694,7 +12623,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -16078,7 +16104,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10710,7 +12635,7 @@
+@@ -10710,7 +12639,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -16087,7 +16113,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10722,7 +12647,8 @@
+@@ -10722,7 +12651,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -16097,7 +16123,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10752,7 +12678,7 @@
+@@ -10752,7 +12682,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -16106,7 +16132,7 @@
        ;;
      esac
      ;;
-@@ -10775,7 +12701,7 @@
+@@ -10775,7 +12705,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -16115,7 +16141,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10798,20 +12724,17 @@
+@@ -10798,22 +12728,19 @@
    dynamic_linker=no
    ;;
  
@@ -16133,6 +16159,8 @@
 -
 -freebsd*)
 -  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+-  version_type=freebsd-$objformat
+-  case $version_type in
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
@@ -16144,10 +16172,12 @@
 +    *) objformat=elf ;;
 +    esac
 +  fi
-   version_type=freebsd-$objformat
-   case $version_type in
++  version_type=freebsd-$objformat
++  case $version_type in
      freebsd-elf*)
-@@ -10829,14 +12752,19 @@
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+       need_version=no
+@@ -10829,14 +12756,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -16169,7 +16199,7 @@
    esac
    ;;
  
-@@ -10856,9 +12784,9 @@
+@@ -10856,9 +12788,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -16181,7 +16211,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10873,7 +12801,7 @@
+@@ -10873,7 +12805,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -16190,7 +16220,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10884,7 +12812,7 @@
+@@ -10884,7 +12816,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -16199,7 +16229,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10896,6 +12824,18 @@
+@@ -10896,6 +12828,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -16218,7 +16248,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -10939,29 +12879,26 @@
+@@ -10939,29 +12883,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -16255,7 +16285,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -10971,6 +12908,18 @@
+@@ -10971,6 +12912,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -16274,7 +16304,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10980,7 +12929,7 @@
+@@ -10980,7 +12933,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -16283,7 +16313,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -11008,8 +12957,13 @@
+@@ -11008,8 +12961,13 @@
  
  openbsd*)
    version_type=sunos
@@ -16298,7 +16328,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -11029,7 +12983,7 @@
+@@ -11029,7 +12987,7 @@
  
  os2*)
    libname_spec='$name'
@@ -16307,7 +16337,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11047,13 +13001,6 @@
+@@ -11047,13 +13005,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -16321,7 +16351,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11079,7 +13026,7 @@
+@@ -11079,7 +13030,7 @@
    need_version=yes
    ;;
  
@@ -16330,7 +16360,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11112,6 +13059,29 @@
+@@ -11112,6 +13063,29 @@
    fi
    ;;
  
@@ -16360,7 +16390,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11123,16 +13093,21 @@
+@@ -11123,16 +13097,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -16388,7 +16418,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11152,8 +13127,8 @@
+@@ -11152,8 +13131,8 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -16399,7 +16429,7 @@
  
  if test "$hardcode_action" = relink; then
    # Fast installation is not supported
-@@ -11166,29 +13141,29 @@
+@@ -11166,29 +13145,29 @@
  
  striplib=
  old_striplib=
@@ -16439,7 +16469,7 @@
      ;;
    esac
  fi
-@@ -11220,8 +13195,8 @@
+@@ -11220,8 +13199,8 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -16450,7 +16480,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11234,40 +13209,52 @@
+@@ -11234,40 +13213,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16515,7 +16545,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11276,14 +13263,15 @@
+@@ -11276,14 +13267,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16524,7 +16554,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -16535,7 +16565,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -11297,8 +13285,8 @@
+@@ -11297,8 +13289,8 @@
     ;;
  
    *)
@@ -16546,7 +16576,7 @@
  if test "${ac_cv_func_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11325,53 +13313,59 @@
+@@ -11325,53 +13317,59 @@
  
  #undef shl_load
  
@@ -16625,7 +16655,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11380,18 +13374,19 @@
+@@ -11380,18 +13378,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16634,7 +16664,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -16651,7 +16681,7 @@
  if test "${ac_cv_lib_dld_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11404,40 +13399,52 @@
+@@ -11404,40 +13403,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16716,7 +16746,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11446,19 +13453,20 @@
+@@ -11446,19 +13457,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16725,7 +16755,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -16743,7 +16773,7 @@
  if test "${ac_cv_func_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11485,53 +13493,59 @@
+@@ -11485,53 +13497,59 @@
  
  #undef dlopen
  
@@ -16822,7 +16852,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11540,18 +13554,19 @@
+@@ -11540,18 +13558,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16831,7 +16861,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -16848,7 +16878,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11564,40 +13579,52 @@
+@@ -11564,40 +13583,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16913,7 +16943,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11606,19 +13633,20 @@
+@@ -11606,19 +13637,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16922,7 +16952,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -16940,7 +16970,7 @@
  if test "${ac_cv_lib_svld_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11631,40 +13659,52 @@
+@@ -11631,40 +13663,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -17005,7 +17035,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11673,19 +13713,20 @@
+@@ -11673,19 +13717,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17014,7 +17044,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -17032,7 +17062,7 @@
  if test "${ac_cv_lib_dld_dld_link+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11698,40 +13739,52 @@
+@@ -11698,40 +13743,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -17097,7 +17127,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11740,14 +13793,15 @@
+@@ -11740,14 +13797,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17106,7 +17136,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -17117,7 +17147,7 @@
  if test $ac_cv_lib_dld_dld_link = yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
  fi
-@@ -11782,13 +13836,13 @@
+@@ -11782,13 +13840,13 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -17134,16 +17164,16 @@
  if test "${lt_cv_dlopen_self+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11798,7 +13852,7 @@
+@@ -11798,7 +13856,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11801 "configure"
-+#line 13855 "configure"
++#line 13859 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11855,6 +13909,8 @@
+@@ -11855,6 +13913,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -17152,7 +17182,7 @@
  
      exit (status);
  }
-@@ -11864,12 +13920,12 @@
+@@ -11864,12 +13924,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -17167,7 +17197,7 @@
      esac
    else :
      # compilation failed
-@@ -11880,13 +13936,13 @@
+@@ -11880,13 +13940,13 @@
  
  
  fi
@@ -17186,16 +17216,16 @@
  if test "${lt_cv_dlopen_self_static+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11896,7 +13952,7 @@
+@@ -11896,7 +13956,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11899 "configure"
-+#line 13955 "configure"
++#line 13959 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11953,6 +14009,8 @@
+@@ -11953,6 +14013,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -17204,7 +17234,7 @@
  
      exit (status);
  }
-@@ -11962,12 +14020,12 @@
+@@ -11962,12 +14024,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -17219,7 +17249,7 @@
      esac
    else :
      # compilation failed
-@@ -11978,8 +14036,8 @@
+@@ -11978,8 +14040,8 @@
  
  
  fi
@@ -17230,7 +17260,7 @@
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
-@@ -12000,19 +14058,19 @@
+@@ -12000,19 +14062,19 @@
  fi
  
  
@@ -17258,7 +17288,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -12021,58 +14079,21 @@
+@@ -12021,58 +14083,21 @@
    fi
    ;;
  
@@ -17324,7 +17354,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12087,7 +14108,8 @@
+@@ -12087,7 +14112,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.
@@ -17334,7 +17364,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12201,11 +14223,11 @@
+@@ -12201,11 +14227,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -17348,7 +17378,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12235,6 +14257,12 @@
+@@ -12235,6 +14261,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -17361,7 +17391,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12246,6 +14274,9 @@
+@@ -12246,6 +14278,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -17371,7 +17401,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12265,7 +14296,7 @@
+@@ -12265,7 +14300,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -17380,7 +17410,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12296,7 +14327,7 @@
+@@ -12296,7 +14331,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -17389,7 +17419,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12311,7 +14342,7 @@
+@@ -12311,7 +14346,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -17398,7 +17428,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12538,7 +14569,10 @@
+@@ -12538,7 +14573,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.
@@ -17410,7 +17440,7 @@
  fi
  
  
-@@ -12551,11 +14585,11 @@
+@@ -12551,11 +14589,11 @@
  CC="$lt_save_CC"
  
  
@@ -17426,7 +17456,7 @@
  
  if test -f "$ltmain" && test -n "$tagnames"; then
    if test ! -f "${ofile}"; then
-@@ -12573,6 +14607,9 @@
+@@ -12573,6 +14611,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -17436,7 +17466,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12603,8 +14640,10 @@
+@@ -12603,8 +14644,10 @@
  
        case $tagname in
        CXX)
@@ -17449,7 +17479,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12623,6 +14662,7 @@
+@@ -12623,6 +14666,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -17457,7 +17487,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12640,7 +14680,7 @@
+@@ -12640,7 +14684,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -17466,7 +17496,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12650,17 +14690,34 @@
+@@ -12650,17 +14694,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -17502,7 +17532,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12671,18 +14728,27 @@
+@@ -12671,18 +14732,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -17533,7 +17563,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12696,18 +14762,18 @@
+@@ -12696,18 +14766,18 @@
    # Set up default GNU C++ configuration
  
  
@@ -17558,7 +17588,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -12736,11 +14802,11 @@
+@@ -12736,11 +14806,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -17574,7 +17604,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12753,7 +14819,7 @@
+@@ -12753,7 +14823,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,
@@ -17583,7 +17613,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -12773,21 +14839,21 @@
+@@ -12773,21 +14843,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -17612,7 +17642,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12797,8 +14863,8 @@
+@@ -12797,8 +14867,8 @@
    ;;
  esac
  fi
@@ -17623,7 +17653,7 @@
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
-@@ -12806,8 +14872,8 @@
+@@ -12806,8 +14876,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
@@ -17634,7 +17664,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12833,7 +14899,7 @@
+@@ -12833,7 +14903,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.
@@ -17643,7 +17673,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12848,8 +14914,8 @@
+@@ -12848,8 +14918,8 @@
  fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
@@ -17654,7 +17684,7 @@
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -12864,8 +14930,23 @@
+@@ -12864,8 +14934,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -17680,7 +17710,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12882,7 +14963,7 @@
+@@ -12882,7 +14967,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -17689,7 +17719,7 @@
        # We only want to do this on AIX 4.2 and lower, the check
        # below for broken collect2 doesn't work under 4.3+
  	collect2name=`${CC} -print-prog-name=collect2`
-@@ -12901,8 +14982,12 @@
+@@ -12901,8 +14986,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -17702,7 +17732,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12911,15 +14996,16 @@
+@@ -12911,15 +15000,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -17723,7 +17753,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -12941,24 +15027,36 @@
+@@ -12941,24 +15031,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17768,7 +17798,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -12972,20 +15070,21 @@
+@@ -12972,20 +15074,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17776,7 +17806,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++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
  
@@ -17794,7 +17824,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -13004,24 +15103,36 @@
+@@ -13004,24 +15107,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17839,7 +17869,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13035,8 +15146,10 @@
+@@ -13035,8 +15150,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17847,11 +17877,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++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
  
-@@ -13045,16 +15158,26 @@
+@@ -13045,16 +15162,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17883,7 +17913,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -13068,12 +15191,12 @@
+@@ -13068,12 +15195,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'
@@ -17898,7 +17928,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -13082,70 +15205,81 @@
+@@ -13082,70 +15209,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -18032,7 +18062,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13156,14 +15290,14 @@
+@@ -13156,14 +15294,14 @@
  	;;
      esac
      ;;
@@ -18049,7 +18079,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13180,12 +15314,12 @@
+@@ -13180,12 +15318,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -18065,7 +18095,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13194,11 +15328,11 @@
+@@ -13194,11 +15332,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.
@@ -18079,7 +18109,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13208,33 +15342,22 @@
+@@ -13208,33 +15346,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -18120,7 +18150,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13245,17 +15368,20 @@
+@@ -13245,17 +15372,20 @@
      esac
  
      case $cc_basename in
@@ -18147,7 +18177,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13271,12 +15397,15 @@
+@@ -13271,12 +15401,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -18167,7 +18197,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13287,11 +15416,25 @@
+@@ -13287,11 +15420,25 @@
  	;;
      esac
      ;;
@@ -18195,7 +18225,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13302,9 +15445,9 @@
+@@ -13302,9 +15449,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -18207,7 +18237,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13313,16 +15456,16 @@
+@@ -13313,16 +15460,16 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -18228,7 +18258,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13340,20 +15483,44 @@
+@@ -13340,20 +15487,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -18279,7 +18309,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13381,7 +15548,7 @@
+@@ -13381,7 +15552,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -18288,7 +18318,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13391,7 +15558,7 @@
+@@ -13391,7 +15562,7 @@
  	;;
      esac
      ;;
@@ -18297,7 +18327,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -13402,15 +15569,31 @@
+@@ -13402,15 +15573,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::"'
      ;;
@@ -18331,7 +18361,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13420,14 +15603,14 @@
+@@ -13420,14 +15607,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -18349,7 +18379,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13445,7 +15628,7 @@
+@@ -13445,7 +15632,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18358,7 +18388,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13464,13 +15647,13 @@
+@@ -13464,13 +15651,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -18374,7 +18404,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13479,17 +15662,17 @@
+@@ -13479,17 +15666,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -18396,7 +18426,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13508,7 +15691,7 @@
+@@ -13508,7 +15695,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18405,37 +18435,41 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13529,27 +15712,14 @@
+@@ -13529,28 +15716,15 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
 -  sco*)
 -    archive_cmds_need_lc_CXX=no
--    case $cc_basename in
++  sunos4*)
+     case $cc_basename in
 -      CC)
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
++      CC*)
++	# Sun C++ 4.x
+ 	# 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
+-  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)
+-	# Lucid
 +      lcc*)
- 	# Lucid
++	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13562,36 +15732,33 @@
+ 	;;
+@@ -13562,36 +15736,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -18484,7 +18518,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13599,9 +15766,9 @@
+@@ -13599,9 +15770,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -18496,7 +18530,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13611,9 +15778,9 @@
+@@ -13611,9 +15782,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
@@ -18508,7 +18542,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13622,9 +15789,9 @@
+@@ -13622,9 +15793,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -18520,7 +18554,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13637,12 +15804,63 @@
+@@ -13637,12 +15808,63 @@
  	;;
      esac
      ;;
@@ -18586,7 +18620,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13662,8 +15880,8 @@
+@@ -13662,8 +15884,8 @@
      ld_shlibs_CXX=no
      ;;
  esac
@@ -18597,7 +18631,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  GCC_CXX="$GXX"
-@@ -13699,7 +15917,7 @@
+@@ -13699,7 +15921,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.
@@ -18606,7 +18640,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13739,7 +15957,7 @@
+@@ -13739,7 +15961,7 @@
         fi
         ;;
  
@@ -18615,7 +18649,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13775,6 +15993,29 @@
+@@ -13775,6 +15997,29 @@
  
  $rm -f confest.$objext
  
@@ -18645,7 +18679,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13783,8 +16024,8 @@
+@@ -13783,8 +16028,8 @@
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -18656,7 +18690,7 @@
  
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -13822,6 +16063,10 @@
+@@ -13822,6 +16067,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -18667,7 +18701,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13830,7 +16075,7 @@
+@@ -13830,7 +16079,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -18676,7 +18710,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13855,18 +16100,28 @@
+@@ -13855,18 +16104,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -18708,7 +18742,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13874,22 +16129,22 @@
+@@ -13874,22 +16133,22 @@
  	    ;;
  	esac
  	;;
@@ -18737,7 +18771,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13902,9 +16157,13 @@
+@@ -13902,9 +16161,13 @@
  	    ;;
  	esac
  	;;
@@ -18752,7 +18786,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13913,20 +16172,26 @@
+@@ -13913,20 +16176,26 @@
  	    ;;
  	esac
  	;;
@@ -18783,7 +18817,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13943,25 +16208,25 @@
+@@ -13943,25 +16212,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -18814,7 +18848,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13975,24 +16240,15 @@
+@@ -13975,24 +16244,15 @@
  	;;
        psos*)
  	;;
@@ -18841,7 +18875,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -14002,12 +16258,12 @@
+@@ -14002,12 +16262,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -18856,7 +18890,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -14017,7 +16273,7 @@
+@@ -14017,7 +16277,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -18865,7 +18899,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -14025,7 +16281,14 @@
+@@ -14025,7 +16285,14 @@
  	    ;;
  	esac
  	;;
@@ -18881,7 +18915,7 @@
  	;;
        vxworks*)
  	;;
-@@ -14035,16 +16298,16 @@
+@@ -14035,16 +16302,16 @@
      esac
    fi
  
@@ -18902,7 +18936,7 @@
  if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14058,26 +16321,28 @@
+@@ -14058,26 +16325,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 \
@@ -18911,12 +18945,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14064: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16327: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16331: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:14068: \$? = $ac_status" >&5
-+   echo "$as_me:16331: \$? = $ac_status" >&5
++   echo "$as_me:16335: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -18938,7 +18972,7 @@
  
  if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
      case $lt_prog_compiler_pic_CXX in
-@@ -14090,7 +16355,7 @@
+@@ -14090,7 +16359,7 @@
  fi
  
  fi
@@ -18947,7 +18981,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -14100,8 +16365,50 @@
+@@ -14100,8 +16369,50 @@
      ;;
  esac
  
@@ -19000,7 +19034,7 @@
  if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14112,60 +16419,58 @@
+@@ -14112,60 +16423,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -19022,12 +19056,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14131: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16431: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16435: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:14135: \$? = $ac_status" >&5
-+   echo "$as_me:16435: \$? = $ac_status" >&5
++   echo "$as_me:16439: \$? = $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
@@ -19079,7 +19113,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14175,8 +16480,8 @@
+@@ -14175,8 +16484,8 @@
    need_locks=no
  fi
  
@@ -19090,7 +19124,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -14193,22 +16498,20 @@
+@@ -14193,22 +16502,20 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -19119,7 +19153,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14226,8 +16529,8 @@
+@@ -14226,8 +16533,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.
@@ -19130,7 +19164,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -14241,6 +16544,7 @@
+@@ -14241,6 +16548,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -19138,7 +19172,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14263,20 +16567,20 @@
+@@ -14263,20 +16571,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -19164,7 +19198,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14286,7 +16590,20 @@
+@@ -14286,7 +16594,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -19186,7 +19220,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14351,7 +16668,7 @@
+@@ -14351,7 +16672,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -19195,7 +19229,7 @@
    ;;
  
  beos*)
-@@ -14360,7 +16677,7 @@
+@@ -14360,7 +16681,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -19204,7 +19238,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14376,7 +16693,7 @@
+@@ -14376,7 +16697,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -19213,7 +19247,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14388,7 +16705,8 @@
+@@ -14388,7 +16709,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -19223,7 +19257,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14418,7 +16736,7 @@
+@@ -14418,7 +16740,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -19232,7 +19266,7 @@
        ;;
      esac
      ;;
-@@ -14441,7 +16759,7 @@
+@@ -14441,7 +16763,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -19241,7 +19275,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14464,20 +16782,17 @@
+@@ -14464,20 +16786,17 @@
    dynamic_linker=no
    ;;
  
@@ -19273,7 +19307,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14495,14 +16810,19 @@
+@@ -14495,14 +16814,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -19295,7 +19329,7 @@
    esac
    ;;
  
-@@ -14522,9 +16842,9 @@
+@@ -14522,9 +16846,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -19307,7 +19341,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14539,7 +16859,7 @@
+@@ -14539,7 +16863,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -19316,7 +19350,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14550,7 +16870,7 @@
+@@ -14550,7 +16874,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -19325,7 +19359,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14562,6 +16882,18 @@
+@@ -14562,6 +16886,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -19344,7 +19378,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -14605,29 +16937,26 @@
+@@ -14605,29 +16941,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -19381,7 +19415,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -14637,6 +16966,18 @@
+@@ -14637,6 +16970,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -19400,7 +19434,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14646,7 +16987,7 @@
+@@ -14646,7 +16991,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -19409,7 +19443,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14674,8 +17015,13 @@
+@@ -14674,8 +17019,13 @@
  
  openbsd*)
    version_type=sunos
@@ -19424,7 +19458,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -14695,7 +17041,7 @@
+@@ -14695,7 +17045,7 @@
  
  os2*)
    libname_spec='$name'
@@ -19433,7 +19467,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14713,13 +17059,6 @@
+@@ -14713,13 +17063,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -19447,7 +19481,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14745,7 +17084,7 @@
+@@ -14745,7 +17088,7 @@
    need_version=yes
    ;;
  
@@ -19456,7 +19490,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14778,6 +17117,29 @@
+@@ -14778,6 +17121,29 @@
    fi
    ;;
  
@@ -19486,7 +19520,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14789,16 +17151,21 @@
+@@ -14789,16 +17155,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -19514,7 +19548,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14818,8 +17185,8 @@
+@@ -14818,8 +17189,8 @@
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -19525,7 +19559,7 @@
  
  if test "$hardcode_action_CXX" = relink; then
    # Fast installation is not supported
-@@ -14830,1266 +17197,444 @@
+@@ -14830,1266 +17201,444 @@
    enable_fast_install=needless
  fi
  
@@ -21124,7 +21158,7 @@
  
  
  archive_cmds_need_lc_F77=no
-@@ -16129,29 +17674,55 @@
+@@ -16129,29 +17678,55 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -21164,19 +21198,19 @@
 +  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
  
 -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
 -echo "$as_me:$LINENO: result: $can_build_shared" >&5
 -echo "${ECHO_T}$can_build_shared" >&6
+ 
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
 +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
 +echo "${ECHO_T}$can_build_shared" >&6; }
- 
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++
 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
  test "$can_build_shared" = "no" && enable_shared=no
@@ -21188,7 +21222,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16159,21 +17730,21 @@
+@@ -16159,21 +17734,21 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -21220,7 +21254,7 @@
  
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -16182,8 +17753,8 @@
+@@ -16182,8 +17757,8 @@
  lt_prog_compiler_pic_F77=
  lt_prog_compiler_static_F77=
  
@@ -21231,7 +21265,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_F77='-Wl,'
-@@ -16221,6 +17792,11 @@
+@@ -16221,6 +17796,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -21243,7 +21277,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16237,7 +17813,7 @@
+@@ -16237,7 +17817,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -21252,7 +21286,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16263,6 +17839,16 @@
+@@ -16263,6 +17843,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -21269,7 +21303,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16274,7 +17860,7 @@
+@@ -16274,7 +17864,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.
@@ -21278,7 +21312,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16297,13 +17883,20 @@
+@@ -16297,13 +17887,20 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -21301,7 +21335,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16318,15 +17911,15 @@
+@@ -16318,15 +17915,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -21323,7 +21357,7 @@
        ;;
  
      sunos4*)
-@@ -16335,7 +17928,7 @@
+@@ -16335,7 +17932,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -21332,7 +21366,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16348,27 +17941,38 @@
+@@ -16348,27 +17945,38 @@
        fi
        ;;
  
@@ -21350,10 +21384,7 @@
        lt_prog_compiler_can_build_shared_F77=no
        ;;
 -    esac
--  fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++
 +    uts4*)
 +      lt_prog_compiler_pic_F77='-pic'
 +      lt_prog_compiler_static_F77='-Bstatic'
@@ -21363,8 +21394,10 @@
 +      lt_prog_compiler_can_build_shared_F77=no
 +      ;;
 +    esac
-+  fi
-+
+   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; }
  
@@ -21380,7 +21413,7 @@
  if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16382,26 +17986,28 @@
+@@ -16382,26 +17990,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 \
@@ -21389,12 +21422,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16388: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17992: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17996: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16392: \$? = $ac_status" >&5
-+   echo "$as_me:17996: \$? = $ac_status" >&5
++   echo "$as_me:18000: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -21416,7 +21449,7 @@
  
  if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
      case $lt_prog_compiler_pic_F77 in
-@@ -16414,7 +18020,7 @@
+@@ -16414,7 +18024,7 @@
  fi
  
  fi
@@ -21425,7 +21458,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16424,8 +18030,50 @@
+@@ -16424,8 +18034,50 @@
      ;;
  esac
  
@@ -21478,7 +21511,7 @@
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16436,60 +18084,58 @@
+@@ -16436,60 +18088,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -21500,12 +21533,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16455: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18096: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18100: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:16459: \$? = $ac_status" >&5
-+   echo "$as_me:18100: \$? = $ac_status" >&5
++   echo "$as_me:18104: \$? = $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
@@ -21557,7 +21590,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16499,8 +18145,8 @@
+@@ -16499,8 +18149,8 @@
    need_locks=no
  fi
  
@@ -21568,7 +21601,7 @@
  
    runpath_var=
    allow_undefined_flag_F77=
-@@ -16538,6 +18184,16 @@
+@@ -16538,6 +18188,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -21585,7 +21618,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16548,6 +18204,10 @@
+@@ -16548,6 +18208,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -21596,7 +21629,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16558,6 +18218,27 @@
+@@ -16558,6 +18222,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -21624,7 +21657,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16595,7 +18276,7 @@
+@@ -16595,7 +18280,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -21633,7 +21666,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16605,13 +18286,13 @@
+@@ -16605,13 +18290,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'
@@ -21650,7 +21683,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16620,23 +18301,70 @@
+@@ -16620,23 +18305,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -21727,7 +21760,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16650,13 +18378,40 @@
+@@ -16650,13 +18382,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21770,7 +21803,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16666,24 +18421,19 @@
+@@ -16666,24 +18425,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21802,7 +21835,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16695,7 +18445,7 @@
+@@ -16695,7 +18449,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -21811,7 +21844,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16717,9 +18467,21 @@
+@@ -16717,9 +18471,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
@@ -21835,7 +21868,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16736,7 +18498,7 @@
+@@ -16736,7 +18502,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -21844,7 +21877,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -16755,8 +18517,12 @@
+@@ -16755,8 +18521,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -21857,7 +21890,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16764,45 +18530,58 @@
+@@ -16764,45 +18534,58 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -21931,7 +21964,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16816,19 +18595,20 @@
+@@ -16816,19 +18599,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -21939,7 +21972,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++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
  
@@ -21957,7 +21990,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16837,24 +18617,36 @@
+@@ -16837,24 +18621,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -22002,7 +22035,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16868,8 +18660,10 @@
+@@ -16868,8 +18664,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -22010,11 +22043,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++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
  
-@@ -16878,13 +18672,11 @@
+@@ -16878,13 +18676,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -22031,7 +22064,7 @@
  	fi
        fi
        ;;
-@@ -16897,7 +18689,7 @@
+@@ -16897,7 +18693,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -22040,7 +22073,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16907,68 +18699,68 @@
+@@ -16907,68 +18703,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -22153,7 +22186,7 @@
      fi
        ;;
  
-@@ -17002,8 +18794,8 @@
+@@ -17002,8 +18798,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -22164,7 +22197,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -17011,7 +18803,7 @@
+@@ -17011,7 +18807,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -22173,7 +22206,7 @@
        else
  	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -17025,47 +18817,62 @@
+@@ -17025,47 +18821,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -22242,25 +22275,25 @@
 +	hppa*64*|ia64*)
  	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
 -	  hardcode_libdir_separator_F77=:
+ 	  hardcode_direct_F77=no
+ 	  hardcode_shlibpath_var_F77=no
+ 	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_F77='-L$libdir'
 -	  hardcode_direct_F77=no
 -	  hardcode_shlibpath_var_F77=no
--	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec_F77='-L$libdir'
- 	  hardcode_direct_F77=no
- 	  hardcode_shlibpath_var_F77=no
 -
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
 -	  hardcode_minus_L_F77=yes
- 	  ;;
+-	  ;;
  	*)
 -	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -	  hardcode_libdir_separator_F77=:
  	  hardcode_direct_F77=yes
  	  export_dynamic_flag_spec_F77='${wl}-E'
  
-@@ -17079,7 +18886,7 @@
+@@ -17079,7 +18890,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -22269,7 +22302,7 @@
        else
  	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -17089,7 +18896,7 @@
+@@ -17089,7 +18900,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -22278,7 +22311,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -17112,7 +18919,8 @@
+@@ -17112,7 +18923,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
@@ -22288,7 +22321,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17122,7 +18930,7 @@
+@@ -17122,7 +18934,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -22297,7 +22330,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17133,14 +18941,14 @@
+@@ -17133,14 +18945,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -22314,7 +22347,7 @@
        else
  	allow_undefined_flag_F77=' -expect_unresolved \*'
  	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -17152,13 +18960,13 @@
+@@ -17152,13 +18964,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -22330,7 +22363,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17166,21 +18974,15 @@
+@@ -17166,21 +18978,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -22356,7 +22389,7 @@
  	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17189,8 +18991,18 @@
+@@ -17189,8 +18995,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -22377,7 +22410,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17199,7 +19011,7 @@
+@@ -17199,7 +19015,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.
@@ -22386,7 +22419,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17247,36 +19059,45 @@
+@@ -17247,36 +19063,45 @@
        fi
        ;;
  
@@ -22453,7 +22486,7 @@
        ;;
  
      uts4*)
-@@ -17291,15 +19112,10 @@
+@@ -17291,15 +19116,10 @@
      esac
    fi
  
@@ -22471,7 +22504,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17317,8 +19133,8 @@
+@@ -17317,8 +19137,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.
@@ -22482,7 +22515,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -17332,6 +19148,7 @@
+@@ -17332,6 +19152,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -22490,7 +22523,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17354,20 +19171,20 @@
+@@ -17354,20 +19175,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -22516,7 +22549,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17377,7 +19194,20 @@
+@@ -17377,7 +19198,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -22538,7 +22571,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17442,7 +19272,7 @@
+@@ -17442,7 +19276,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -22547,7 +22580,7 @@
    ;;
  
  beos*)
-@@ -17451,7 +19281,7 @@
+@@ -17451,7 +19285,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -22556,7 +22589,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17467,7 +19297,7 @@
+@@ -17467,7 +19301,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -22565,7 +22598,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17479,7 +19309,8 @@
+@@ -17479,7 +19313,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -22575,7 +22608,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17509,7 +19340,7 @@
+@@ -17509,7 +19344,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -22584,7 +22617,7 @@
        ;;
      esac
      ;;
-@@ -17532,7 +19363,7 @@
+@@ -17532,7 +19367,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -22593,7 +22626,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17555,20 +19386,17 @@
+@@ -17555,20 +19390,17 @@
    dynamic_linker=no
    ;;
  
@@ -22625,7 +22658,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17586,14 +19414,19 @@
+@@ -17586,14 +19418,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -22647,7 +22680,7 @@
    esac
    ;;
  
-@@ -17613,9 +19446,9 @@
+@@ -17613,9 +19450,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -22659,7 +22692,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17630,7 +19463,7 @@
+@@ -17630,7 +19467,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -22668,7 +22701,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17641,7 +19474,7 @@
+@@ -17641,7 +19478,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -22677,7 +22710,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17653,6 +19486,18 @@
+@@ -17653,6 +19490,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -22696,7 +22729,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17696,29 +19541,26 @@
+@@ -17696,29 +19545,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -22733,7 +22766,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -17728,6 +19570,18 @@
+@@ -17728,6 +19574,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -22752,7 +22785,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17737,7 +19591,7 @@
+@@ -17737,7 +19595,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -22761,7 +22794,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17765,8 +19619,13 @@
+@@ -17765,8 +19623,13 @@
  
  openbsd*)
    version_type=sunos
@@ -22776,7 +22809,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -17786,7 +19645,7 @@
+@@ -17786,7 +19649,7 @@
  
  os2*)
    libname_spec='$name'
@@ -22785,7 +22818,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17804,13 +19663,6 @@
+@@ -17804,13 +19667,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -22799,7 +22832,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17836,7 +19688,7 @@
+@@ -17836,7 +19692,7 @@
    need_version=yes
    ;;
  
@@ -22808,7 +22841,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17869,27 +19721,55 @@
+@@ -17869,27 +19725,55 @@
    fi
    ;;
  
@@ -22820,8 +22853,13 @@
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+-*)
+-  dynamic_linker=no
+-  ;;
 +  hardcode_into_libs=yes
 +  if test "$with_gnu_ld" = yes; then
 +    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -22841,13 +22879,9 @@
 +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
--  ;;
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
 +
 +*)
 +  dynamic_linker=no
@@ -22877,7 +22911,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17909,8 +19789,8 @@
+@@ -17909,8 +19793,8 @@
    # directories.
    hardcode_action_F77=unsupported
  fi
@@ -22888,7 +22922,7 @@
  
  if test "$hardcode_action_F77" = relink; then
    # Fast installation is not supported
-@@ -17921,36 +19801,6 @@
+@@ -17921,36 +19805,6 @@
    enable_fast_install=needless
  fi
  
@@ -22925,7 +22959,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17965,7 +19815,8 @@
+@@ -17965,7 +19819,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.
@@ -22935,7 +22969,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -18065,6 +19916,12 @@
+@@ -18065,6 +19920,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -22948,7 +22982,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -18076,6 +19933,9 @@
+@@ -18076,6 +19937,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -22958,7 +22992,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -18095,7 +19955,7 @@
+@@ -18095,7 +19959,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -22967,7 +23001,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18126,7 +19986,7 @@
+@@ -18126,7 +19990,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -22976,7 +23010,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18141,7 +20001,7 @@
+@@ -18141,7 +20005,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -22985,7 +23019,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18343,7 +20203,10 @@
+@@ -18343,7 +20207,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.
@@ -22997,7 +23031,7 @@
  fi
  
  
-@@ -18364,7 +20227,6 @@
+@@ -18364,7 +20231,6 @@
  	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
  
@@ -23005,7 +23039,7 @@
  # Source file extension for Java test sources.
  ac_ext=java
  
-@@ -18376,26 +20238,55 @@
+@@ -18376,26 +20242,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -23062,7 +23096,7 @@
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
  ## the running order or otherwise move them around unless you know exactly
-@@ -18407,8 +20298,8 @@
+@@ -18407,8 +20302,8 @@
    lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
  
@@ -23073,7 +23107,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18422,26 +20313,28 @@
+@@ -18422,26 +20317,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 \
@@ -23082,12 +23116,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18428: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20319: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20323: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18432: \$? = $ac_status" >&5
-+   echo "$as_me:20323: \$? = $ac_status" >&5
++   echo "$as_me:20327: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -23109,7 +23143,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18455,8 +20348,8 @@
+@@ -18455,8 +20352,8 @@
  lt_prog_compiler_pic_GCJ=
  lt_prog_compiler_static_GCJ=
  
@@ -23120,7 +23154,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18494,6 +20387,11 @@
+@@ -18494,6 +20391,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -23132,7 +23166,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18510,7 +20408,7 @@
+@@ -18510,7 +20412,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -23141,7 +23175,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18536,6 +20434,16 @@
+@@ -18536,6 +20438,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -23158,7 +23192,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18547,7 +20455,7 @@
+@@ -18547,7 +20459,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.
@@ -23167,7 +23201,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18570,13 +20478,20 @@
+@@ -18570,13 +20482,20 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -23190,7 +23224,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18591,15 +20506,15 @@
+@@ -18591,15 +20510,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -23212,7 +23246,7 @@
        ;;
  
      sunos4*)
-@@ -18608,7 +20523,7 @@
+@@ -18608,7 +20527,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -23221,7 +23255,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18621,6 +20536,17 @@
+@@ -18621,6 +20540,17 @@
        fi
        ;;
  
@@ -23239,7 +23273,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18632,16 +20558,16 @@
+@@ -18632,16 +20562,16 @@
      esac
    fi
  
@@ -23260,7 +23294,7 @@
  if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18655,26 +20581,28 @@
+@@ -18655,26 +20585,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 \
@@ -23269,12 +23303,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18661: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20587: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20591: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18665: \$? = $ac_status" >&5
-+   echo "$as_me:20591: \$? = $ac_status" >&5
++   echo "$as_me:20595: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -23296,7 +23330,7 @@
  
  if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
      case $lt_prog_compiler_pic_GCJ in
-@@ -18687,7 +20615,7 @@
+@@ -18687,7 +20619,7 @@
  fi
  
  fi
@@ -23305,7 +23339,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18697,8 +20625,50 @@
+@@ -18697,8 +20629,50 @@
      ;;
  esac
  
@@ -23358,7 +23392,7 @@
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18709,60 +20679,58 @@
+@@ -18709,60 +20683,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -23380,12 +23414,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18728: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20691: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20695: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:18732: \$? = $ac_status" >&5
-+   echo "$as_me:20695: \$? = $ac_status" >&5
++   echo "$as_me:20699: \$? = $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
@@ -23437,7 +23471,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18772,8 +20740,8 @@
+@@ -18772,8 +20744,8 @@
    need_locks=no
  fi
  
@@ -23448,7 +23482,7 @@
  
    runpath_var=
    allow_undefined_flag_GCJ=
-@@ -18811,6 +20779,16 @@
+@@ -18811,6 +20783,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -23465,7 +23499,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18821,6 +20799,10 @@
+@@ -18821,6 +20803,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -23476,7 +23510,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18831,6 +20813,27 @@
+@@ -18831,6 +20817,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -23504,7 +23538,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18868,7 +20871,7 @@
+@@ -18868,7 +20875,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -23513,7 +23547,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18878,13 +20881,13 @@
+@@ -18878,13 +20885,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'
@@ -23530,7 +23564,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18893,23 +20896,70 @@
+@@ -18893,23 +20900,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -23607,7 +23641,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18923,13 +20973,40 @@
+@@ -18923,13 +20977,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23650,7 +23684,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18939,24 +21016,19 @@
+@@ -18939,24 +21020,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23682,7 +23716,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18968,7 +21040,7 @@
+@@ -18968,7 +21044,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -23691,7 +23725,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -18990,9 +21062,21 @@
+@@ -18990,9 +21066,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
@@ -23715,7 +23749,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -19009,7 +21093,7 @@
+@@ -19009,7 +21097,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -23724,7 +23758,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -19028,8 +21112,12 @@
+@@ -19028,8 +21116,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -23737,7 +23771,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -19037,22 +21125,23 @@
+@@ -19037,22 +21129,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -23768,7 +23802,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19068,24 +21157,36 @@
+@@ -19068,24 +21161,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23813,7 +23847,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19099,19 +21200,20 @@
+@@ -19099,19 +21204,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23821,7 +23855,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++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
  
@@ -23839,7 +23873,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19130,24 +21232,36 @@
+@@ -19130,24 +21236,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23884,7 +23918,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19161,8 +21275,10 @@
+@@ -19161,8 +21279,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23892,11 +23926,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++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
  
-@@ -19171,13 +21287,11 @@
+@@ -19171,13 +21291,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23913,7 +23947,7 @@
  	fi
        fi
        ;;
-@@ -19190,7 +21304,7 @@
+@@ -19190,7 +21308,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -23922,7 +23956,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19200,68 +21314,68 @@
+@@ -19200,68 +21318,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -24035,7 +24069,7 @@
      fi
        ;;
  
-@@ -19295,8 +21409,8 @@
+@@ -19295,8 +21413,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -24046,7 +24080,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19304,7 +21418,7 @@
+@@ -19304,7 +21422,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -24055,7 +24089,7 @@
        else
  	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -19318,47 +21432,62 @@
+@@ -19318,47 +21436,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -24142,7 +24176,7 @@
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19372,7 +21501,7 @@
+@@ -19372,7 +21505,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -24151,7 +24185,7 @@
        else
  	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19382,7 +21511,7 @@
+@@ -19382,7 +21515,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -24160,7 +24194,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -19405,7 +21534,8 @@
+@@ -19405,7 +21538,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
@@ -24170,7 +24204,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19415,7 +21545,7 @@
+@@ -19415,7 +21549,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -24179,7 +24213,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19426,14 +21556,14 @@
+@@ -19426,14 +21560,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -24196,7 +24230,7 @@
        else
  	allow_undefined_flag_GCJ=' -expect_unresolved \*'
  	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19445,13 +21575,13 @@
+@@ -19445,13 +21579,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -24212,7 +24246,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19459,21 +21589,15 @@
+@@ -19459,21 +21593,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -24238,7 +24272,7 @@
  	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19482,8 +21606,18 @@
+@@ -19482,8 +21610,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -24259,7 +24293,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19492,7 +21626,7 @@
+@@ -19492,7 +21630,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.
@@ -24268,7 +24302,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19540,36 +21674,45 @@
+@@ -19540,1513 +21678,746 @@
        fi
        ;;
  
@@ -24298,8 +24332,8 @@
        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++
@@ -24308,177 +24342,286 @@
 -      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
-+      # always be unresolved, which means just about no library would
-+      # ever link correctly.  If we're not using GNU ld we use -z text
-+      # though, which does catch some bad symbols but isn't as heavy-handed
-+      # as -z defs.
-+      no_undefined_flag_GCJ='${wl}-z,text'
-+      allow_undefined_flag_GCJ='${wl}-z,nodefs'
-+      archive_cmds_need_lc_GCJ=no
-       hardcode_shlibpath_var_GCJ=no
-+      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+      hardcode_libdir_separator_GCJ=':'
-+      link_all_deplibs_GCJ=yes
-+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-       runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-       ;;
- 
-     uts4*)
-@@ -19584,15 +21727,10 @@
-     esac
-   fi
- 
+-      hardcode_shlibpath_var_GCJ=no
+-      runpath_var='LD_RUN_PATH'
+-      ;;
+-
+-    uts4*)
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+-
+-    *)
+-      ld_shlibs_GCJ=no
+-      ;;
+-    esac
+-  fi
+-
 -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
- 
+-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?
- #
-@@ -19610,8 +21748,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.
+-#
+-# 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.
 -      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
- 
-@@ -19625,6 +21763,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=
-@@ -19647,20 +21786,20 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
+-      $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
+-        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*
 -      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=
-@@ -19670,7 +21809,20 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-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"
 -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
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
-+    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
-+else
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
- need_lib_prefix=unknown
- hardcode_into_libs=no
- 
-@@ -19735,7 +21887,7 @@
- amigaos*)
-   library_names_spec='$libname.ixlibrary $libname.a'
-   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-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.
 -  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*)
-@@ -19744,7 +21896,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
+-  ;;
+-
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  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}'
-@@ -19760,7 +21912,7 @@
- 
- 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}'
+-  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
 -  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
- 
-@@ -19772,7 +21924,8 @@
-       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
+-
+-  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~
 -      $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'
-@@ -19802,7 +21955,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-    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'
 -      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
-     ;;
-@@ -19825,7 +21978,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
+-      ;;
+-    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
 -  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"`
-@@ -19848,20 +22001,17 @@
-   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"`
+-  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
+-  ;;
+-
 -kfreebsd*-gnu*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -24493,76 +24636,90 @@
 -
 -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.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -19879,14 +22029,19 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
+-  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
+-    ;;
 -  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
-     ;;
-+  freebsd*) # from 4.6 on
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-   esac
-   ;;
- 
-@@ -19906,9 +22061,9 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
+-    shlibpath_overrides_runpath=no
+-    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
 -  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
-@@ -19923,7 +22078,7 @@
-     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
+-    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*)
 -     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
-@@ -19934,7 +22089,7 @@
-      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
+-     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
+-     ;;
+-   *)
 -    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
-@@ -19946,1107 +22101,319 @@
-   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
+-    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'
+-  ;;
+-
 -irix5* | irix6* | nonstopux*)
 -  case $host_os in
 -    nonstopux*) version_type=nonstopux ;;
@@ -24607,13 +24764,11 @@
 -
 -# This must be Linux ELF.
 -linux*)
-+interix3*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
+-  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}'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
+-  soname_spec='${libname}${release}${shared_ext}$major'
 -  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 -  libsuff=
 -  if test "x$LINUX_64_MODE" = x64; then
@@ -24622,9 +24777,8 @@
 -      libsuff=64
 -    fi
 -  fi
-+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
 -  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
 -  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
 -  # This implies no fast_install, which is unacceptable.
@@ -24732,7 +24886,7 @@
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
-   hardcode_into_libs=yes
+-  hardcode_into_libs=yes
 -  # ldd complains unless libraries are executable
 -  postinstall_cmds='chmod +x $lib'
 -  ;;
@@ -24791,7 +24945,7 @@
 -
 -*)
 -  dynamic_linker=no
-   ;;
+-  ;;
 -esac
 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -echo "${ECHO_T}$dynamic_linker" >&6
@@ -25233,7 +25387,8 @@
 -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"
@@ -25275,7 +25430,23 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      no_undefined_flag_GCJ='${wl}-z,text'
++      allow_undefined_flag_GCJ='${wl}-z,nodefs'
++      archive_cmds_need_lc_GCJ=no
++      hardcode_shlibpath_var_GCJ=no
++      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      hardcode_libdir_separator_GCJ=':'
++      link_all_deplibs_GCJ=yes
++      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
++      runpath_var='LD_RUN_PATH'
+ 
 -ac_cv_lib_dl_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -25300,7 +25471,15 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -25342,7 +25521,12 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    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
++      ;;
+ 
 -ac_cv_lib_svld_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -25367,7 +25551,12 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++    *)
++      ld_shlibs_GCJ=no
++      ;;
++    esac
++  fi
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -25396,20 +25585,82 @@
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++{ 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.
++      { 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); }; } &&
 -	 { 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); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        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
 -  ac_cv_lib_dld_dld_link=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&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*
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
++      ;;
++    esac
++  fi
++  ;;
++esac
+ 
 -ac_cv_lib_dld_dld_link=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -25420,23 +25671,358 @@
 -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"
++{ 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=
++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"
++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
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    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
++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
+ 
 -fi
--
--
++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'
++  ;;
+ 
 -fi
--
--
++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.
++  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'
++  ;;
+ 
 -fi
--
--
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
+ 
++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
++  ;;
+ 
 -fi
--
--
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  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~
++      $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
+ 
 -fi
--
--
--fi
++    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'
++      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
++  ;;
+ 
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
++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
++  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
+-    enable_dlopen=no
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+   fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
+ 
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++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
++  ;;
+ 
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++freebsd1*)
++  dynamic_linker=no
++  ;;
+ 
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) 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
++    ;;
++  freebsd3.[01]* | freebsdelf3.[01]*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  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
++    ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
+ 
+-    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 20851 "configure"
+-#include "confdefs.h"
++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
++  ;;
+ 
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++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
++  case $host_cpu in
++  ia64*)
++    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*)
++     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
++     ;;
++   *)
++    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'
++  ;;
+ 
+-#include <stdio.h>
++interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
 +irix5* | irix6* | nonstopux*)
 +  case $host_os in
 +    nonstopux*) version_type=nonstopux ;;
@@ -25465,8 +26051,8 @@
 +      libsuff=64 shlibsuff=64 libmagic=64-bit;;
 +    *) libsuff= shlibsuff= libmagic=never-match;;
 +    esac
-     ;;
-   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}"
@@ -25474,43 +26060,6 @@
 +  hardcode_into_libs=yes
 +  ;;
  
--  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 20851 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -25944,7 +26493,7 @@
  fi
  
  
-@@ -21063,7 +22430,8 @@
+@@ -21063,7 +22434,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.
@@ -25954,7 +26503,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21163,6 +22531,12 @@
+@@ -21163,6 +22535,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -25967,7 +26516,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21174,6 +22548,9 @@
+@@ -21174,6 +22552,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -25977,7 +26526,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21193,7 +22570,7 @@
+@@ -21193,7 +22574,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -25986,7 +26535,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21224,7 +22601,7 @@
+@@ -21224,7 +22605,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -25995,7 +26544,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21239,7 +22616,7 @@
+@@ -21239,7 +22620,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -26004,7 +26553,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21441,7 +22818,10 @@
+@@ -21441,7 +22822,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.
@@ -26016,7 +26565,7 @@
  fi
  
  
-@@ -21461,7 +22841,6 @@
+@@ -21461,7 +22845,6 @@
        RC)
  
  
@@ -26024,7 +26573,7 @@
  # Source file extension for RC test sources.
  ac_ext=rc
  
-@@ -21480,15 +22859,42 @@
+@@ -21480,15 +22863,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -26067,7 +26616,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21504,7 +22910,8 @@
+@@ -21504,7 +22914,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.
@@ -26077,7 +26626,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21604,6 +23011,12 @@
+@@ -21604,6 +23015,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -26090,7 +26639,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21615,6 +23028,9 @@
+@@ -21615,6 +23032,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -26100,7 +26649,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21634,7 +23050,7 @@
+@@ -21634,7 +23054,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -26109,7 +26658,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21665,7 +23081,7 @@
+@@ -21665,7 +23085,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -26118,7 +26667,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21680,7 +23096,7 @@
+@@ -21680,7 +23100,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -26127,7 +26676,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21882,7 +23298,10 @@
+@@ -21882,7 +23302,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.
@@ -26139,7 +26688,7 @@
  fi
  
  
-@@ -21929,7 +23348,7 @@
+@@ -21929,7 +23352,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -26148,7 +26697,7 @@
  
  # Prevent multiple expansion
  
-@@ -21984,8 +23403,8 @@
+@@ -21984,8 +23407,8 @@
  
      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -26159,7 +26708,7 @@
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22011,17 +23430,17 @@
+@@ -22011,17 +23434,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -26183,7 +26732,7 @@
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22036,32 +23455,33 @@
+@@ -22036,32 +23459,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26225,7 +26774,7 @@
          GMSGFMT=":"
        fi
        MSGFMT=$GMSGFMT
-@@ -22070,8 +23490,8 @@
+@@ -22070,8 +23494,8 @@
  
        # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -26236,7 +26785,7 @@
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22097,11 +23517,11 @@
+@@ -22097,11 +23521,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -26252,7 +26801,7 @@
  fi
  
  
-@@ -22109,8 +23529,8 @@
+@@ -22109,8 +23533,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -26263,7 +26812,7 @@
  	  XGETTEXT=":"
  	fi
        fi
-@@ -22120,8 +23540,7 @@
+@@ -22120,8 +23544,7 @@
  
  
  
@@ -26273,7 +26822,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22133,8 +23552,8 @@
+@@ -22133,8 +23556,8 @@
      ac_save_CXXFLAGS="$CXXFLAGS"
      CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
  
@@ -26284,7 +26833,7 @@
      if test "${kde_cv_stl_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22162,24 +23581,36 @@
+@@ -22162,24 +23585,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26329,7 +26878,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22188,15 +23619,16 @@
+@@ -22188,15 +23623,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26350,7 +26899,7 @@
  
     if test "$kde_cv_stl_works" = "yes"; then
       # back compatible
-@@ -22225,15 +23657,14 @@
+@@ -22225,15 +23661,14 @@
  
  
  
@@ -26369,7 +26918,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22245,9 +23676,6 @@
+@@ -22245,9 +23680,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26379,7 +26928,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22273,24 +23701,36 @@
+@@ -22273,24 +23705,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26424,7 +26973,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22299,9 +23739,10 @@
+@@ -22299,9 +23743,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26437,7 +26986,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -22314,11 +23755,11 @@
+@@ -22314,11 +23759,11 @@
  fi
  
  
@@ -26453,7 +27002,7 @@
  if test "${kde_cv_proto_strlcat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22339,8 +23780,7 @@
+@@ -22339,8 +23784,7 @@
  if test "x$kde_cv_proto_strlcat" = xunknown; then
  
  
@@ -26463,7 +27012,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22378,24 +23818,36 @@
+@@ -22378,24 +23822,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26508,7 +27057,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22405,10 +23857,11 @@
+@@ -22405,10 +23861,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26518,11 +27067,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
  ac_ext=c
-@@ -22421,8 +23874,8 @@
+@@ -22421,8 +23878,8 @@
  
  fi
  
@@ -26533,7 +27082,7 @@
  
  if test "x$kde_cv_func_strlcat" = xyes; then
  
-@@ -22446,15 +23899,14 @@
+@@ -22446,15 +23903,14 @@
  
  
  
@@ -26552,7 +27101,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22466,9 +23918,6 @@
+@@ -22466,9 +23922,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26562,7 +27111,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22493,24 +23942,36 @@
+@@ -22493,24 +23946,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26607,7 +27156,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22519,9 +23980,10 @@
+@@ -22519,9 +23984,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26620,7 +27169,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -22534,11 +23996,11 @@
+@@ -22534,11 +24000,11 @@
  fi
  
  
@@ -26636,7 +27185,7 @@
  if test "${kde_cv_proto_strlcpy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22559,8 +24021,7 @@
+@@ -22559,8 +24025,7 @@
  if test "x$kde_cv_proto_strlcpy" = xunknown; then
  
  
@@ -26646,7 +27195,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22597,24 +24058,36 @@
+@@ -22597,24 +24062,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26691,7 +27240,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22624,10 +24097,11 @@
+@@ -22624,10 +24101,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26701,11 +27250,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
  ac_ext=c
-@@ -22640,8 +24114,8 @@
+@@ -22640,8 +24118,8 @@
  
  fi
  
@@ -26716,7 +27265,7 @@
  
  if test "x$kde_cv_func_strlcpy" = xyes; then
  
-@@ -22664,8 +24138,8 @@
+@@ -22664,8 +24142,8 @@
  
  
  
@@ -26727,7 +27276,7 @@
  if test "${ac_cv_lib_util_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22682,30 +24156,42 @@
+@@ -22682,30 +24160,42 @@
  int
  main ()
  {
@@ -26779,7 +27328,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22714,20 +24200,21 @@
+@@ -22714,20 +24204,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26788,7 +27337,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -26807,7 +27356,7 @@
  if test "${ac_cv_lib_compat_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22744,30 +24231,42 @@
+@@ -22744,30 +24235,42 @@
  int
  main ()
  {
@@ -26859,7 +27408,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22776,21 +24275,22 @@
+@@ -22776,21 +24279,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26868,7 +27417,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -26888,7 +27437,7 @@
  if test "${ac_cv_lib_crypt_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22803,40 +24303,52 @@
+@@ -22803,40 +24307,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26953,7 +27502,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22845,19 +24357,20 @@
+@@ -22845,19 +24361,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26962,7 +27511,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -26980,7 +27529,7 @@
  if test "${ac_cv_lib_c_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22870,40 +24383,52 @@
+@@ -22870,40 +24387,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27045,7 +27594,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22912,14 +24437,15 @@
+@@ -22912,14 +24441,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27054,7 +27603,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -27065,7 +27614,7 @@
  if test $ac_cv_lib_c_crypt = yes; then
    kde_have_crypt=yes
  else
-@@ -22945,13 +24471,13 @@
+@@ -22945,13 +24475,13 @@
  
     fi
  
@@ -27082,7 +27631,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22980,24 +24506,36 @@
+@@ -22980,24 +24510,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27127,7 +27676,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23009,8 +24547,10 @@
+@@ -23009,8 +24551,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27139,7 +27688,7 @@
        ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23020,17 +24560,17 @@
+@@ -23020,17 +24564,17 @@
  
  fi
  
@@ -27162,7 +27711,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23059,24 +24599,36 @@
+@@ -23059,24 +24603,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27207,7 +27756,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23088,8 +24640,10 @@
+@@ -23088,8 +24644,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27219,7 +27768,7 @@
           done
           ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -23100,8 +24654,8 @@
+@@ -23100,8 +24658,8 @@
  
  fi
  
@@ -27230,7 +27779,7 @@
     fi
  
  cat >>confdefs.h <<_ACEOF
-@@ -23114,8 +24668,8 @@
+@@ -23114,8 +24672,8 @@
  _ACEOF
  
  
@@ -27241,7 +27790,7 @@
  if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23128,40 +24682,52 @@
+@@ -23128,40 +24686,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27306,7 +27855,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23170,21 +24736,22 @@
+@@ -23170,21 +24740,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27315,7 +27864,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -27335,7 +27884,7 @@
  if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23197,40 +24764,52 @@
+@@ -23197,40 +24768,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27400,7 +27949,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23239,21 +24818,22 @@
+@@ -23239,21 +24822,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27409,7 +27958,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -27429,7 +27978,7 @@
  if test "${ac_cv_func_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23280,53 +24860,59 @@
+@@ -23280,53 +24864,59 @@
  
  #undef inet_ntoa
  
@@ -27508,7 +28057,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23335,17 +24921,18 @@
+@@ -23335,17 +24925,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27517,7 +28066,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
@@ -27533,7 +28082,7 @@
  if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23358,40 +24945,52 @@
+@@ -23358,40 +24949,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27598,7 +28147,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23400,21 +24999,22 @@
+@@ -23400,21 +25003,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27607,7 +28156,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -27627,7 +28176,7 @@
  if test "${ac_cv_func_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23441,53 +25041,59 @@
+@@ -23441,53 +25045,59 @@
  
  #undef connect
  
@@ -27706,7 +28255,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23496,17 +25102,18 @@
+@@ -23496,17 +25106,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27715,7 +28264,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -27731,7 +28280,7 @@
  if test "${ac_cv_lib_socket_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23519,40 +25126,52 @@
+@@ -23519,40 +25130,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27796,7 +28345,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23561,22 +25180,23 @@
+@@ -23561,22 +25184,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27805,7 +28354,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -27826,7 +28375,7 @@
  if test "${ac_cv_func_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23603,53 +25223,59 @@
+@@ -23603,53 +25227,59 @@
  
  #undef remove
  
@@ -27905,7 +28454,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23658,17 +25284,18 @@
+@@ -23658,17 +25288,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27914,7 +28463,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -27930,7 +28479,7 @@
  if test "${ac_cv_lib_posix_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23681,40 +25308,52 @@
+@@ -23681,40 +25312,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27995,7 +28544,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23723,14 +25362,15 @@
+@@ -23723,14 +25366,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28004,7 +28553,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -28015,7 +28564,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -23738,8 +25378,8 @@
+@@ -23738,8 +25382,8 @@
     fi
  
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -28026,7 +28575,7 @@
  if test "${ac_cv_func_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23766,53 +25406,59 @@
+@@ -23766,53 +25410,59 @@
  
  #undef shmat
  
@@ -28105,7 +28654,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23821,18 +25467,19 @@
+@@ -23821,18 +25471,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28114,7 +28663,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -28131,7 +28680,7 @@
  if test "${ac_cv_lib_ipc_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23845,40 +25492,52 @@
+@@ -23845,40 +25496,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28196,7 +28745,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23887,14 +25546,15 @@
+@@ -23887,14 +25550,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28205,7 +28754,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -28216,7 +28765,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -23908,18 +25568,19 @@
+@@ -23908,18 +25572,19 @@
  for ac_header in sys/types.h stdint.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28244,7 +28793,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23930,24 +25591,36 @@
+@@ -23930,24 +25595,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28289,7 +28838,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23956,15 +25629,16 @@
+@@ -23956,15 +25633,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28312,7 +28861,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23973,8 +25647,13 @@
+@@ -23973,8 +25651,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -28328,7 +28877,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -23998,9 +25677,10 @@
+@@ -23998,9 +25681,10 @@
  
    ac_header_preproc=no
  fi
@@ -28341,7 +28890,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24024,25 +25704,19 @@
+@@ -24024,25 +25708,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;}
@@ -28374,7 +28923,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24060,18 +25734,19 @@
+@@ -24060,18 +25738,19 @@
  for ac_header in sys/bitypes.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28402,7 +28951,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24082,24 +25757,36 @@
+@@ -24082,24 +25761,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28447,7 +28996,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24108,15 +25795,16 @@
+@@ -24108,15 +25799,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28470,7 +29019,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24125,8 +25813,13 @@
+@@ -24125,8 +25817,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -28486,7 +29035,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24150,9 +25843,10 @@
+@@ -24150,9 +25847,10 @@
  
    ac_header_preproc=no
  fi
@@ -28499,7 +29048,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24176,25 +25870,19 @@
+@@ -24176,25 +25874,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;}
@@ -28532,7 +29081,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24208,8 +25896,8 @@
+@@ -24208,8 +25900,8 @@
  
  
     # darwin requires a poll emulation library
@@ -28543,7 +29092,7 @@
  if test "${ac_cv_lib_poll_poll+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24222,40 +25910,52 @@
+@@ -24222,40 +25914,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28608,7 +29157,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24264,14 +25964,15 @@
+@@ -24264,14 +25968,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28617,7 +29166,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -28628,7 +29177,7 @@
  if test $ac_cv_lib_poll_poll = yes; then
    LIB_POLL="-lpoll"
  fi
-@@ -24282,18 +25983,19 @@
+@@ -24282,18 +25987,19 @@
  for ac_header in Carbon/Carbon.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28656,7 +29205,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24304,24 +26006,36 @@
+@@ -24304,24 +26010,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28701,7 +29250,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24330,15 +26044,16 @@
+@@ -24330,15 +26048,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28724,7 +29273,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24347,8 +26062,13 @@
+@@ -24347,8 +26066,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -28740,7 +29289,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24372,9 +26092,10 @@
+@@ -24372,9 +26096,10 @@
  
    ac_header_preproc=no
  fi
@@ -28753,7 +29302,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24398,25 +26119,19 @@
+@@ -24398,25 +26123,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;}
@@ -28786,7 +29335,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24431,17 +26146,17 @@
+@@ -24431,17 +26150,17 @@
  
     # CoreAudio framework
     if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -28810,7 +29359,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24452,24 +26167,36 @@
+@@ -24452,24 +26171,36 @@
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28855,7 +29404,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24478,15 +26205,16 @@
+@@ -24478,15 +26209,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28878,7 +29427,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24495,8 +26223,13 @@
+@@ -24495,8 +26227,13 @@
  /* end confdefs.h.  */
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
@@ -28894,7 +29443,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24520,9 +26253,10 @@
+@@ -24520,9 +26257,10 @@
  
    ac_header_preproc=no
  fi
@@ -28907,7 +29456,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24546,25 +26280,18 @@
+@@ -24546,25 +26284,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;}
@@ -28938,7 +29487,7 @@
  
  fi
  if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24581,8 +26308,8 @@
+@@ -24581,8 +26312,8 @@
  
  
  
@@ -28949,7 +29498,7 @@
    kde_libs_safe="$LIBS"
    LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
    cat >conftest.$ac_ext <<_ACEOF
-@@ -24608,31 +26335,43 @@
+@@ -24608,31 +26339,43 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29003,7 +29552,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RES_INIT 1
-@@ -24643,25 +26382,25 @@
+@@ -24643,25 +26386,25 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29015,7 +29564,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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_libs_safe
  
@@ -29036,7 +29585,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24673,9 +26412,6 @@
+@@ -24673,9 +26416,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -29046,7 +29595,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24701,24 +26437,36 @@
+@@ -24701,24 +26441,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29091,7 +29640,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24727,9 +26475,10 @@
+@@ -24727,9 +26479,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29104,7 +29653,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -24742,11 +26491,11 @@
+@@ -24742,11 +26495,11 @@
  fi
  
  
@@ -29120,7 +29669,7 @@
  if test "${kde_cv_proto_res_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24767,8 +26516,7 @@
+@@ -24767,8 +26520,7 @@
  if test "x$kde_cv_proto_res_init" = xunknown; then
  
  
@@ -29130,7 +29679,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24806,24 +26554,36 @@
+@@ -24806,24 +26558,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29175,7 +29724,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24833,10 +26593,11 @@
+@@ -24833,10 +26597,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29185,11 +29734,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
  ac_ext=c
-@@ -24849,8 +26610,8 @@
+@@ -24849,8 +26614,8 @@
  
  fi
  
@@ -29200,7 +29749,7 @@
  
  if test "x$kde_cv_func_res_init" = xyes; then
  
-@@ -24877,8 +26638,8 @@
+@@ -24877,8 +26642,8 @@
     LIBSOCKET="$X_EXTRA_LIBS"
  
  
@@ -29211,7 +29760,7 @@
  if test "${ac_cv_lib_ucb_killpg+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24891,40 +26652,52 @@
+@@ -24891,40 +26656,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29276,7 +29825,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24933,27 +26706,28 @@
+@@ -24933,27 +26710,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29285,7 +29834,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -29315,7 +29864,7 @@
  if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24966,40 +26740,52 @@
+@@ -24966,40 +26744,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29380,7 +29929,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25008,22 +26794,23 @@
+@@ -25008,22 +26798,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29389,7 +29938,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -29410,7 +29959,7 @@
  if test "${ac_cv_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25034,36 +26821,49 @@
+@@ -25034,36 +26825,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29470,7 +30019,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25072,20 +26872,21 @@
+@@ -25072,23 +26876,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29488,22 +30037,29 @@
  
 -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 "$ac_cv_type_int" = yes; then
+-  if test "$ac_cv_type_int" = yes; then
 -  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # The cast to long int works around a bug in the HP C Compiler
-   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-   # This bug is HP SR number 8606223364.
-@@ -25098,10 +26899,11 @@
+-  # 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
+@@ -25098,10 +26902,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29512,7 +30068,7 @@
  test_array [0] = 0
  
    ;
-@@ -25109,24 +26911,36 @@
+@@ -25109,24 +26915,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29557,11 +30113,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25139,10 +26953,11 @@
+@@ -25139,10 +26957,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29570,7 +30127,7 @@
  test_array [0] = 0
  
    ;
-@@ -25150,24 +26965,36 @@
+@@ -25150,24 +26970,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29615,7 +30172,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25176,30 +27003,32 @@
+@@ -25176,30 +27008,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29648,7 +30205,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29657,7 +30215,7 @@
  test_array [0] = 0
  
    ;
-@@ -25207,24 +27036,36 @@
+@@ -25207,24 +27042,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29702,11 +30260,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25237,10 +27078,11 @@
+@@ -25237,10 +27084,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29715,7 +30274,7 @@
  test_array [0] = 0
  
    ;
-@@ -25248,24 +27090,36 @@
+@@ -25248,24 +27097,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29760,7 +30319,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25274,24 +27128,27 @@
+@@ -25274,24 +27135,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29798,11 +30357,12 @@
  # 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`
-@@ -25302,10 +27159,11 @@
+@@ -25302,10 +27166,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29811,7 +30371,7 @@
  test_array [0] = 0
  
    ;
-@@ -25313,24 +27171,36 @@
+@@ -25313,24 +27179,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29856,7 +30416,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25339,26 +27209,20 @@
+@@ -25339,26 +27217,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29870,13 +30430,17 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_int=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++'') if test "$ac_cv_type_int" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (int), 77
 +echo "$as_me: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_int=0
++	       fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -29889,19 +30453,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25366,8 +27230,9 @@
+@@ -25366,8 +27242,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (int)); }
 -unsigned long ulongval () { return (long) (sizeof (int)); }
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
 +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -25376,35 +27241,44 @@
+@@ -25376,35 +27254,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -29959,12 +30524,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25415,28 +27289,27 @@
+@@ -25415,28 +27302,31 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++if test "$ac_cv_type_int" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (int), 77
 +echo "$as_me: error: cannot compute sizeof (int)
@@ -29973,18 +30539,24 @@
 -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
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
- else
-   ac_cv_sizeof_int=0
+-else
+-  ac_cv_sizeof_int=0
  fi
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_INT $ac_cv_sizeof_int
  _ACEOF
@@ -29996,7 +30568,7 @@
  if test "${ac_cv_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25447,36 +27320,49 @@
+@@ -25447,36 +27337,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30056,7 +30628,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25485,20 +27371,21 @@
+@@ -25485,23 +27388,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30074,22 +30646,29 @@
  
 -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 "$ac_cv_type_short" = yes; then
+-  if test "$ac_cv_type_short" = yes; then
 -  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # The cast to long int works around a bug in the HP C Compiler
-   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-   # This bug is HP SR number 8606223364.
-@@ -25511,10 +27398,11 @@
+-  # 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
+@@ -25511,10 +27414,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30098,7 +30677,7 @@
  test_array [0] = 0
  
    ;
-@@ -25522,24 +27410,36 @@
+@@ -25522,24 +27427,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30143,11 +30722,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25552,10 +27452,11 @@
+@@ -25552,10 +27469,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30156,7 +30736,7 @@
  test_array [0] = 0
  
    ;
-@@ -25563,24 +27464,36 @@
+@@ -25563,24 +27482,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30201,7 +30781,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25589,30 +27502,32 @@
+@@ -25589,30 +27520,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30234,7 +30814,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30243,7 +30824,7 @@
  test_array [0] = 0
  
    ;
-@@ -25620,24 +27535,36 @@
+@@ -25620,24 +27554,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30288,11 +30869,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25650,10 +27577,11 @@
+@@ -25650,10 +27596,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30301,7 +30883,7 @@
  test_array [0] = 0
  
    ;
-@@ -25661,24 +27589,36 @@
+@@ -25661,24 +27609,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30346,7 +30928,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25687,24 +27627,27 @@
+@@ -25687,24 +27647,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30384,11 +30966,12 @@
  # 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`
-@@ -25715,10 +27658,11 @@
+@@ -25715,10 +27678,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30397,7 +30980,7 @@
  test_array [0] = 0
  
    ;
-@@ -25726,24 +27670,36 @@
+@@ -25726,24 +27691,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30442,7 +31025,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25752,26 +27708,20 @@
+@@ -25752,26 +27729,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30456,13 +31039,17 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_short=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++'') if test "$ac_cv_type_short" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (short), 77
 +echo "$as_me: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_short=0
++	       fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -30475,19 +31062,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25779,8 +27729,9 @@
+@@ -25779,8 +27754,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (short)); }
 -unsigned long ulongval () { return (long) (sizeof (short)); }
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
 +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -25789,35 +27740,44 @@
+@@ -25789,35 +27766,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -30545,12 +31133,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25828,28 +27788,27 @@
+@@ -25828,28 +27814,31 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++if test "$ac_cv_type_short" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (short), 77
 +echo "$as_me: error: cannot compute sizeof (short)
@@ -30559,18 +31148,24 @@
 -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
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
- else
-   ac_cv_sizeof_short=0
+-else
+-  ac_cv_sizeof_short=0
+-fi
  fi
- fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SHORT $ac_cv_sizeof_short
  _ACEOF
@@ -30582,7 +31177,7 @@
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25860,36 +27819,49 @@
+@@ -25860,36 +27849,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30642,7 +31237,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25898,20 +27870,21 @@
+@@ -25898,23 +27900,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30660,22 +31255,29 @@
  
 -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 "$ac_cv_type_long" = yes; then
+-  if test "$ac_cv_type_long" = yes; then
 -  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # The cast to long int works around a bug in the HP C Compiler
-   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-   # This bug is HP SR number 8606223364.
-@@ -25924,10 +27897,11 @@
+-  # 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
+@@ -25924,10 +27926,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30684,7 +31286,7 @@
  test_array [0] = 0
  
    ;
-@@ -25935,24 +27909,36 @@
+@@ -25935,24 +27939,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30729,11 +31331,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25965,10 +27951,11 @@
+@@ -25965,10 +27981,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30742,7 +31345,7 @@
  test_array [0] = 0
  
    ;
-@@ -25976,24 +27963,36 @@
+@@ -25976,24 +27994,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30787,7 +31390,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26002,30 +28001,32 @@
+@@ -26002,30 +28032,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30820,7 +31423,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30829,7 +31433,7 @@
  test_array [0] = 0
  
    ;
-@@ -26033,24 +28034,36 @@
+@@ -26033,24 +28066,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30874,11 +31478,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26063,10 +28076,11 @@
+@@ -26063,10 +28108,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30887,7 +31492,7 @@
  test_array [0] = 0
  
    ;
-@@ -26074,24 +28088,36 @@
+@@ -26074,24 +28121,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30932,7 +31537,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26100,24 +28126,27 @@
+@@ -26100,24 +28159,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30970,11 +31575,12 @@
  # 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`
-@@ -26128,10 +28157,11 @@
+@@ -26128,10 +28190,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30983,7 +31589,7 @@
  test_array [0] = 0
  
    ;
-@@ -26139,24 +28169,36 @@
+@@ -26139,24 +28203,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31028,7 +31634,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26165,26 +28207,20 @@
+@@ -26165,26 +28241,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31042,13 +31648,17 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_long=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++'') if test "$ac_cv_type_long" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (long), 77
 +echo "$as_me: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_long=0
++	       fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -31061,19 +31671,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26192,8 +28228,9 @@
+@@ -26192,8 +28266,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (long)); }
 -unsigned long ulongval () { return (long) (sizeof (long)); }
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
 +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -26202,35 +28239,44 @@
+@@ -26202,35 +28278,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31131,12 +31742,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26241,28 +28287,27 @@
+@@ -26241,28 +28326,31 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++if test "$ac_cv_type_long" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (long), 77
 +echo "$as_me: error: cannot compute sizeof (long)
@@ -31145,18 +31757,24 @@
 -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
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
- else
-   ac_cv_sizeof_long=0
+-else
+-  ac_cv_sizeof_long=0
  fi
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG $ac_cv_sizeof_long
  _ACEOF
@@ -31168,7 +31786,7 @@
  if test "${ac_cv_type_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26273,36 +28318,49 @@
+@@ -26273,36 +28361,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31228,7 +31846,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26311,20 +28369,21 @@
+@@ -26311,23 +28412,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31246,22 +31864,29 @@
  
 -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 "$ac_cv_type_char_p" = yes; then
+-  if test "$ac_cv_type_char_p" = yes; then
 -  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # The cast to long int works around a bug in the HP C Compiler
-   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-   # This bug is HP SR number 8606223364.
-@@ -26337,10 +28396,11 @@
+-  # 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
+@@ -26337,10 +28438,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -31270,7 +31895,7 @@
  test_array [0] = 0
  
    ;
-@@ -26348,24 +28408,36 @@
+@@ -26348,24 +28451,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31315,11 +31940,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26378,10 +28450,11 @@
+@@ -26378,10 +28493,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -31328,7 +31954,7 @@
  test_array [0] = 0
  
    ;
-@@ -26389,24 +28462,36 @@
+@@ -26389,24 +28506,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31373,7 +31999,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26415,30 +28500,32 @@
+@@ -26415,30 +28544,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31406,7 +32032,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -31415,7 +32042,7 @@
  test_array [0] = 0
  
    ;
-@@ -26446,24 +28533,36 @@
+@@ -26446,24 +28578,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31460,11 +32087,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26476,10 +28575,11 @@
+@@ -26476,10 +28620,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -31473,7 +32101,7 @@
  test_array [0] = 0
  
    ;
-@@ -26487,24 +28587,36 @@
+@@ -26487,24 +28633,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31518,7 +32146,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26513,24 +28625,27 @@
+@@ -26513,24 +28671,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31556,11 +32184,12 @@
  # 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`
-@@ -26541,10 +28656,11 @@
+@@ -26541,10 +28702,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -31569,7 +32198,7 @@
  test_array [0] = 0
  
    ;
-@@ -26552,24 +28668,36 @@
+@@ -26552,24 +28715,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31614,7 +32243,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26578,26 +28706,20 @@
+@@ -26578,26 +28753,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31628,13 +32257,17 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_char_p=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++'') 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
 -echo "$as_me: error: cannot compute sizeof (char *), 77
 +echo "$as_me: error: cannot compute sizeof (char *)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_char_p=0
++	       fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -31647,19 +32280,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26605,8 +28727,9 @@
+@@ -26605,8 +28778,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (char *)); }
 -unsigned long ulongval () { return (long) (sizeof (char *)); }
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
 +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -26615,35 +28738,44 @@
+@@ -26615,35 +28790,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31717,12 +32351,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26654,30 +28786,29 @@
+@@ -26654,30 +28838,33 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++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
 -echo "$as_me: error: cannot compute sizeof (char *), 77
 +echo "$as_me: error: cannot compute sizeof (char *)
@@ -31731,18 +32366,24 @@
 -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
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
- else
-   ac_cv_sizeof_char_p=0
+-else
+-  ac_cv_sizeof_char_p=0
+-fi
  fi
- fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
  _ACEOF
@@ -31756,7 +32397,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26690,40 +28821,52 @@
+@@ -26690,40 +28877,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -31821,7 +32462,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26732,14 +28875,15 @@
+@@ -26732,14 +28931,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31830,7 +32471,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -31841,7 +32482,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
  
  LIBDL="-ldl"
-@@ -26748,8 +28892,8 @@
+@@ -26748,8 +28948,8 @@
  fi
  
  
@@ -31852,7 +32493,7 @@
  if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26762,40 +28906,52 @@
+@@ -26762,40 +28962,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -31917,7 +32558,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26804,14 +28960,15 @@
+@@ -26804,14 +29016,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31926,7 +32567,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -31937,7 +32578,7 @@
  if test $ac_cv_lib_dld_shl_unload = yes; then
  
  LIBDL="-ldld"
-@@ -26825,8 +28982,8 @@
+@@ -26825,8 +29038,8 @@
  
  
  
@@ -31948,7 +32589,7 @@
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26837,36 +28994,49 @@
+@@ -26837,36 +29050,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -32008,7 +32649,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26875,20 +29045,21 @@
+@@ -26875,23 +29101,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32026,22 +32667,29 @@
  
 -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 "$ac_cv_type_size_t" = yes; then
+-  if test "$ac_cv_type_size_t" = yes; then
 -  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # The cast to long int works around a bug in the HP C Compiler
-   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-   # This bug is HP SR number 8606223364.
-@@ -26901,10 +29072,11 @@
+-  # 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
+@@ -26901,10 +29127,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32050,7 +32698,7 @@
  test_array [0] = 0
  
    ;
-@@ -26912,24 +29084,36 @@
+@@ -26912,24 +29140,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32095,11 +32743,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26942,10 +29126,11 @@
+@@ -26942,10 +29182,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32108,7 +32757,7 @@
  test_array [0] = 0
  
    ;
-@@ -26953,24 +29138,36 @@
+@@ -26953,24 +29195,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32153,7 +32802,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26979,30 +29176,32 @@
+@@ -26979,30 +29233,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32186,7 +32835,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32195,7 +32845,7 @@
  test_array [0] = 0
  
    ;
-@@ -27010,24 +29209,36 @@
+@@ -27010,24 +29267,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32240,11 +32890,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27040,10 +29251,11 @@
+@@ -27040,10 +29309,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32253,7 +32904,7 @@
  test_array [0] = 0
  
    ;
-@@ -27051,24 +29263,36 @@
+@@ -27051,24 +29322,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32298,7 +32949,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27077,24 +29301,27 @@
+@@ -27077,24 +29360,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32336,11 +32987,12 @@
  # 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`
-@@ -27105,10 +29332,11 @@
+@@ -27105,10 +29391,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32349,7 +33001,7 @@
  test_array [0] = 0
  
    ;
-@@ -27116,24 +29344,36 @@
+@@ -27116,24 +29404,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32394,7 +33046,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27142,26 +29382,20 @@
+@@ -27142,26 +29442,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32408,13 +33060,17 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_size_t=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++'') 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
 -echo "$as_me: error: cannot compute sizeof (size_t), 77
 +echo "$as_me: error: cannot compute sizeof (size_t)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_size_t=0
++	       fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -32427,19 +33083,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27169,8 +29403,9 @@
+@@ -27169,8 +29467,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (size_t)); }
 -unsigned long ulongval () { return (long) (sizeof (size_t)); }
-+		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
 +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -27179,35 +29414,44 @@
+@@ -27179,35 +29479,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -32497,12 +33154,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27218,29 +29462,28 @@
+@@ -27218,29 +29527,32 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++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
 -echo "$as_me: error: cannot compute sizeof (size_t), 77
 +echo "$as_me: error: cannot compute sizeof (size_t)
@@ -32511,18 +33169,24 @@
 -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
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
- else
-   ac_cv_sizeof_size_t=0
+-else
+-  ac_cv_sizeof_size_t=0
  fi
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
  _ACEOF
@@ -32535,7 +33199,7 @@
  if test "${ac_cv_type_unsigned_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -27251,36 +29494,49 @@
+@@ -27251,36 +29563,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -32595,7 +33259,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27289,20 +29545,21 @@
+@@ -27289,23 +29614,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32613,22 +33277,29 @@
  
 -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 "$ac_cv_type_unsigned_long" = yes; then
+-  if test "$ac_cv_type_unsigned_long" = yes; then
 -  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # The cast to long int works around a bug in the HP C Compiler
-   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-   # This bug is HP SR number 8606223364.
-@@ -27315,10 +29572,11 @@
+-  # 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
+@@ -27315,10 +29640,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32637,7 +33308,7 @@
  test_array [0] = 0
  
    ;
-@@ -27326,24 +29584,36 @@
+@@ -27326,24 +29653,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32682,11 +33353,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27356,10 +29626,11 @@
+@@ -27356,10 +29695,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32695,7 +33367,7 @@
  test_array [0] = 0
  
    ;
-@@ -27367,24 +29638,36 @@
+@@ -27367,24 +29708,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32740,7 +33412,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27393,30 +29676,32 @@
+@@ -27393,30 +29746,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32773,7 +33445,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32782,7 +33455,7 @@
  test_array [0] = 0
  
    ;
-@@ -27424,24 +29709,36 @@
+@@ -27424,24 +29780,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32827,11 +33500,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27454,10 +29751,11 @@
+@@ -27454,10 +29822,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32840,7 +33514,7 @@
  test_array [0] = 0
  
    ;
-@@ -27465,24 +29763,36 @@
+@@ -27465,24 +29835,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32885,7 +33559,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27491,24 +29801,27 @@
+@@ -27491,24 +29873,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32923,11 +33597,12 @@
  # 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`
-@@ -27519,10 +29832,11 @@
+@@ -27519,10 +29904,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32936,7 +33611,7 @@
  test_array [0] = 0
  
    ;
-@@ -27530,24 +29844,36 @@
+@@ -27530,24 +29917,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32981,7 +33656,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27556,26 +29882,20 @@
+@@ -27556,26 +29955,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32995,13 +33670,17 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++'') 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
 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77
 +echo "$as_me: error: cannot compute sizeof (unsigned long)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_unsigned_long=0
++	       fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -33014,19 +33693,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27583,8 +29903,9 @@
+@@ -27583,8 +29980,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (unsigned long)); }
 -unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
-+		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
 +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -27593,35 +29914,44 @@
+@@ -27593,35 +29992,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -33084,12 +33764,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27632,30 +29962,29 @@
+@@ -27632,30 +30040,33 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++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
 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77
 +echo "$as_me: error: cannot compute sizeof (unsigned long)
@@ -33098,18 +33779,24 @@
 -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
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
- else
-   ac_cv_sizeof_unsigned_long=0
+-else
+-  ac_cv_sizeof_unsigned_long=0
+-fi
  fi
- fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
  _ACEOF
@@ -33123,7 +33810,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27676,36 +30005,48 @@
+@@ -27676,36 +30087,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33184,7 +33871,7 @@
        { { echo "$as_me:$LINENO: error:
         Apparently on your system our assumption sizeof size_t == sizeof unsigned long
         does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27717,18 +30058,18 @@
+@@ -27717,18 +30140,18 @@
     { (exit 1); exit 1; }; }
  
  fi
@@ -33208,7 +33895,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27758,24 +30099,36 @@
+@@ -27758,24 +30181,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33253,7 +33940,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27784,9 +30137,10 @@
+@@ -27784,9 +30219,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33262,11 +33949,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
-@@ -27799,26 +30153,26 @@
+@@ -27799,26 +30235,26 @@
  
  
  fi
@@ -33303,7 +33990,7 @@
  
    KDE_USE_FPIE=""
    KDE_USE_PIE=""
-@@ -27837,18 +30191,19 @@
+@@ -27837,18 +30273,19 @@
  for ac_header in crt_externs.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -33331,7 +34018,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27859,24 +30214,36 @@
+@@ -27859,24 +30296,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33376,7 +34063,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27885,15 +30252,16 @@
+@@ -27885,15 +30334,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33399,7 +34086,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27902,8 +30270,13 @@
+@@ -27902,8 +30352,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -33415,7 +34102,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -27927,9 +30300,10 @@
+@@ -27927,9 +30382,10 @@
  
    ac_header_preproc=no
  fi
@@ -33428,7 +34115,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27953,25 +30327,19 @@
+@@ -27953,25 +30409,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;}
@@ -33461,7 +34148,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27983,8 +30351,8 @@
+@@ -27983,8 +30433,8 @@
  
  done
  
@@ -33472,7 +34159,7 @@
  if test "${ac_cv_func__NSGetEnviron+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28011,53 +30379,59 @@
+@@ -28011,53 +30461,59 @@
  
  #undef _NSGetEnviron
  
@@ -33491,13 +34178,14 @@
      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
+-choke me
 -#else
 -char (*f) () = _NSGetEnviron;
 -#endif
 -#ifdef __cplusplus
 -}
++#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron
++choke me
  #endif
  
  int
@@ -33551,7 +34239,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28066,13 +30440,14 @@
+@@ -28066,13 +30522,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33560,7 +34248,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
@@ -33570,7 +34258,7 @@
  if test $ac_cv_func__NSGetEnviron = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -28093,9 +30468,9 @@
+@@ -28093,9 +30550,9 @@
  for ac_func in vsnprintf snprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33583,7 +34271,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -28121,53 +30496,59 @@
+@@ -28121,53 +30578,59 @@
  
  #undef $ac_func
  
@@ -33662,7 +34350,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28176,13 +30557,15 @@
+@@ -28176,13 +30639,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33671,7 +34359,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -33682,7 +34370,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28199,32 +30582,32 @@
+@@ -28199,32 +30664,32 @@
  
  
  
@@ -33727,7 +34415,7 @@
  
  # used to disable x11-specific stuff on special platforms
  
-@@ -28240,8 +30623,8 @@
+@@ -28240,8 +30705,8 @@
  
  if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
  
@@ -33738,7 +34426,7 @@
  
  if test "${kde_cv_have_x+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28278,8 +30661,13 @@
+@@ -28278,8 +30743,13 @@
  /* end confdefs.h.  */
  #include <$x_direct_test_include>
  _ACEOF
@@ -33754,7 +34442,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -28346,6 +30734,7 @@
+@@ -28346,6 +30816,7 @@
      fi
    done
  fi
@@ -33762,7 +34450,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = NO
  
-@@ -28375,24 +30764,36 @@
+@@ -28375,24 +30846,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33807,7 +34495,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28403,7 +30804,7 @@
+@@ -28403,7 +30886,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33816,17 +34504,17 @@
  # 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}/` \
-@@ -28451,7 +30852,8 @@
+@@ -28451,7 +30934,8 @@
    done
  done
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
  
-@@ -28461,21 +30863,26 @@
+@@ -28461,21 +30945,26 @@
  *-*-solaris*)
    ;;
  *)
@@ -33861,7 +34549,7 @@
  	ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
-@@ -28483,7 +30890,7 @@
+@@ -28483,7 +30972,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
@@ -33870,7 +34558,7 @@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
-@@ -28492,7 +30899,7 @@
+@@ -28492,7 +30981,7 @@
      esac
    fi
    cd ..
@@ -33879,7 +34567,7 @@
  fi
  
    if test -z "$ac_x_includes"; then
-@@ -28536,12 +30943,12 @@
+@@ -28536,12 +31025,12 @@
  eval "$kde_cv_have_x"
  
  if test "$have_x" != yes; then
@@ -33896,7 +34584,7 @@
  fi
  
  if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28569,8 +30976,8 @@
+@@ -28569,8 +31058,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.
@@ -33907,7 +34595,7 @@
  if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28583,40 +30990,52 @@
+@@ -28583,40 +31072,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33972,7 +34660,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28625,14 +31044,15 @@
+@@ -28625,14 +31126,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33981,7 +34669,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -33992,7 +34680,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    LIBSM="-lSM -lICE"
  fi
-@@ -28641,8 +31061,8 @@
+@@ -28641,8 +31143,8 @@
  
  LIB_X11='-lX11 $(LIBSOCKET)'
  
@@ -34003,7 +34691,7 @@
  if test "${kde_cv_have_libXext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28676,24 +31096,36 @@
+@@ -28676,24 +31178,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34048,7 +34736,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28702,10 +31134,11 @@
+@@ -28702,10 +31216,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34058,11 +34746,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
  LDFLAGS=$kde_ldflags_safe
-@@ -28714,8 +31147,8 @@
+@@ -28714,8 +31229,8 @@
  fi
  
  
@@ -34073,7 +34761,7 @@
  
  if test "$kde_cv_have_libXext" = "no"; then
    { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28861,8 +31294,8 @@
+@@ -28861,8 +31376,8 @@
      else
        PTHREAD_LIBS_save="$PTHREAD_LIBS"
        PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -34084,7 +34772,7 @@
  
       kde_save_LDFLAGS="$LDFLAGS"
            kde_save_LIBS="$LIBS"
-@@ -28873,9 +31306,9 @@
+@@ -28873,9 +31388,9 @@
  	;;
       esac
       as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -34097,7 +34785,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -28887,40 +31320,52 @@
+@@ -28887,40 +31402,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -34162,7 +34850,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28929,14 +31374,16 @@
+@@ -28929,14 +31456,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34171,7 +34859,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -34183,7 +34871,7 @@
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
    LIBPTHREAD="$PTHREAD_LIBS_save"
  fi
-@@ -28949,8 +31396,8 @@
+@@ -28949,8 +31478,8 @@
    fi
  
      if test -z "$LIBPTHREAD"; then
@@ -34194,7 +34882,7 @@
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28963,40 +31410,52 @@
+@@ -28963,40 +31492,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -34259,7 +34947,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29005,14 +31464,15 @@
+@@ -29005,14 +31546,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34268,7 +34956,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
@@ -34279,7 +34967,7 @@
  if test $ac_cv_lib_pthread_pthread_create = yes; then
    LIBPTHREAD="-lpthread"
  fi
-@@ -29020,8 +31480,8 @@
+@@ -29020,8 +31562,8 @@
    fi
  
      if test -z "$LIBPTHREAD" ; then
@@ -34290,7 +34978,7 @@
      kde_safe_libs=$LIBS
      LIBS="$LIBS -lpthread"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -29040,40 +31500,53 @@
+@@ -29040,40 +31582,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34353,11 +35041,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
-@@ -29088,16 +31561,15 @@
+@@ -29088,16 +31643,15 @@
        USE_THREADS=""
        if test -z "$LIBPTHREAD"; then
  
@@ -34378,7 +35066,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29124,24 +31596,36 @@
+@@ -29124,24 +31678,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34423,7 +35111,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29150,8 +31634,10 @@
+@@ -29150,8 +31716,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34431,11 +35119,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -29164,13 +31650,13 @@
+@@ -29164,13 +31732,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34453,7 +35141,7 @@
   :
  
  fi
-@@ -29182,16 +31668,15 @@
+@@ -29182,16 +31750,15 @@
      case $host_os in
   	solaris*)
  
@@ -34474,7 +35162,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29218,24 +31703,36 @@
+@@ -29218,24 +31785,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34519,7 +35207,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29244,8 +31741,10 @@
+@@ -29244,8 +31823,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34527,11 +35215,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -29258,13 +31757,13 @@
+@@ -29258,13 +31839,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34549,7 +35237,7 @@
   :
  
  fi
-@@ -29291,17 +31790,17 @@
+@@ -29291,17 +31872,17 @@
  
  
  
@@ -34573,7 +35261,7 @@
  kde_extra_includes=
  if test -n "$kde_use_extra_includes" && \
     test "$kde_use_extra_includes" != "NONE"; then
-@@ -29319,21 +31818,21 @@
+@@ -29319,21 +31900,21 @@
  fi
  
  
@@ -34603,7 +35291,7 @@
  if test -n "$kde_use_extra_libs" && \
     test "$kde_use_extra_libs" != "NONE"; then
  
-@@ -29352,14 +31851,14 @@
+@@ -29352,14 +31933,14 @@
  
  
  
@@ -34622,7 +35310,7 @@
  if test "${ac_cv_lib_z+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29393,24 +31892,36 @@
+@@ -29393,24 +31974,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34667,7 +35355,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29419,9 +31930,10 @@
+@@ -29419,9 +32012,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34676,11 +35364,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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"
-@@ -29434,8 +31946,8 @@
+@@ -29434,8 +32028,8 @@
  _ACEOF
  
    LIBZ="$ac_cv_lib_z"
@@ -34691,7 +35379,7 @@
  else
    { { echo "$as_me:$LINENO: error: not found.
            Possibly configure picks up an outdated version
-@@ -29455,8 +31967,8 @@
+@@ -29455,8 +32049,8 @@
  
  
  
@@ -34702,7 +35390,7 @@
  if test "${ac_cv_lib_png+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29492,24 +32004,36 @@
+@@ -29492,24 +32086,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34747,7 +35435,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29518,10 +32042,11 @@
+@@ -29518,10 +32124,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34757,11 +35445,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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"
-@@ -29535,19 +32060,19 @@
+@@ -29535,19 +32142,19 @@
  
    LIBPNG="$ac_cv_lib_png"
  
@@ -34787,7 +35475,7 @@
  if test "${ac_cv_lib_jpeg_6b+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29580,24 +32105,36 @@
+@@ -29580,24 +32187,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34832,7 +35520,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29606,9 +32143,10 @@
+@@ -29606,9 +32225,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34841,11 +35529,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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"
-@@ -29618,14 +32156,14 @@
+@@ -29618,14 +32238,14 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -34866,7 +35554,7 @@
  if test "${ac_cv_lib_jpeg_normal+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29658,24 +32196,36 @@
+@@ -29658,24 +32278,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34911,7 +35599,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29684,9 +32234,10 @@
+@@ -29684,9 +32316,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34920,11 +35608,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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"
-@@ -29696,11 +32247,11 @@
+@@ -29696,11 +32329,11 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -34940,16 +35628,16 @@
  
         LIBJPEG=
  
-@@ -29720,7 +32271,7 @@
+@@ -29720,7 +32353,7 @@
  do
    for j in jpeglib.h;
    do
 -    echo "configure: 29723: $i/$j" >&5
-+    echo "configure: 32274: $i/$j" >&5
++    echo "configure: 32356: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29767,14 +32318,14 @@
+@@ -29767,14 +32400,14 @@
  
  
  
@@ -34967,7 +35655,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -29817,8 +32368,8 @@
+@@ -29817,8 +32450,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34978,7 +35666,7 @@
  
  		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
  We need perl to generate some code." >&5
-@@ -29827,8 +32378,8 @@
+@@ -29827,8 +32460,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34989,7 +35677,7 @@
        PERL=$kde_cv_path
  
     fi
-@@ -29842,10 +32393,9 @@
+@@ -29842,10 +32475,9 @@
  
  
  
@@ -35002,7 +35690,7 @@
  else
  
      if test $kde_qtver = 3; then
-@@ -29855,7 +32405,8 @@
+@@ -29855,7 +32487,8 @@
      fi
  
  
@@ -35012,7 +35700,7 @@
  
  USING_QT_MT=""
  
-@@ -29875,13 +32426,13 @@
+@@ -29875,13 +32508,13 @@
    else
      kde_check_threading_default=yes
    fi
@@ -35030,7 +35718,7 @@
    if test "x$kde_use_threading" = "xyes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -29953,8 +32504,8 @@
+@@ -29953,8 +32586,8 @@
    LIBQT="$LIBQT $LIBDL"
  fi
  
@@ -35041,7 +35729,7 @@
  
  if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
  LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29963,34 +32514,34 @@
+@@ -29963,34 +32596,34 @@
  qt_libraries=""
  qt_includes=""
  
@@ -35088,16 +35776,16 @@
  
  if test "${ac_cv_have_qt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30018,7 +32569,7 @@
+@@ -30018,7 +32651,7 @@
  do
    for j in $kde_qt_header;
    do
 -    echo "configure: 30021: $i/$j" >&5
-+    echo "configure: 32572: $i/$j" >&5
++    echo "configure: 32654: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30055,8 +32606,7 @@
+@@ -30055,8 +32688,7 @@
  ac_qt_libraries="$qt_libdir"
  
  
@@ -35107,7 +35795,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30193,13 +32743,13 @@
+@@ -30193,13 +32825,13 @@
  eval "$ac_cv_have_qt"
  
  if test "$have_qt" != yes; then
@@ -35125,7 +35813,7 @@
  
    qt_libraries="$ac_qt_libraries"
    qt_includes="$ac_qt_includes"
-@@ -30208,15 +32758,14 @@
+@@ -30208,15 +32840,14 @@
  if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
  
  
@@ -35144,7 +35832,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30337,12 +32886,12 @@
+@@ -30337,12 +32968,12 @@
  
  
  if test "$kde_cv_qt_direct" = "yes"; then
@@ -35161,7 +35849,7 @@
  
  fi
  
-@@ -30380,14 +32929,14 @@
+@@ -30380,14 +33011,14 @@
     fi
  
  
@@ -35179,7 +35867,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30430,8 +32979,8 @@
+@@ -30430,8 +33061,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35190,7 +35878,7 @@
  
      { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
  Please check whether you installed Qt correctly.
-@@ -30452,22 +33001,22 @@
+@@ -30452,22 +33083,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35218,7 +35906,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30510,12 +33059,12 @@
+@@ -30510,12 +33141,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35235,7 +35923,7 @@
        UIC_PATH=$kde_cv_path
  
     fi
-@@ -30545,10 +33094,10 @@
+@@ -30545,10 +33176,10 @@
  
         if test $kde_qtver = 3; then
  
@@ -35249,7 +35937,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30571,22 +33120,22 @@
+@@ -30571,22 +33202,22 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35279,7 +35967,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30609,13 +33158,13 @@
+@@ -30609,13 +33240,13 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35297,7 +35985,7 @@
          :
          ac_uic_supports_nounload=no
      fi
-@@ -30646,15 +33195,14 @@
+@@ -30646,15 +33277,14 @@
  
  
  if test -n "$LIBJPEG"; then
@@ -35316,7 +36004,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30687,24 +33235,36 @@
+@@ -30687,24 +33317,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35361,7 +36049,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -30713,9 +33273,10 @@
+@@ -30713,9 +33355,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35370,11 +36058,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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"
-@@ -30731,12 +33292,12 @@
+@@ -30731,12 +33374,12 @@
  
  
  if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -35391,7 +36079,7 @@
    LIBJPEG_QT=
  fi
  
-@@ -30767,15 +33328,15 @@
+@@ -30767,15 +33410,15 @@
  
  
  
@@ -35413,7 +36101,7 @@
  
  if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
  
-@@ -30799,11 +33360,11 @@
+@@ -30799,11 +33442,11 @@
  
  
  
@@ -35429,34 +36117,34 @@
  
  if test "${prefix}" != NONE; then
    kde_includes=${includedir}
-@@ -30855,7 +33416,7 @@
+@@ -30855,7 +33498,7 @@
  do
    for j in $kde_check_header;
    do
 -    echo "configure: 30858: $i/$j" >&5
-+    echo "configure: 33419: $i/$j" >&5
++    echo "configure: 33501: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30885,7 +33446,7 @@
+@@ -30885,7 +33528,7 @@
  do
    for j in $kde_check_lib;
    do
 -    echo "configure: 30888: $i/$j" >&5
-+    echo "configure: 33449: $i/$j" >&5
++    echo "configure: 33531: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30903,7 +33464,7 @@
+@@ -30903,7 +33546,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
 -    echo "configure: 30906: $i/$j" >&5
-+    echo "configure: 33467: $i/$j" >&5
++    echo "configure: 33549: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -30962,12 +33523,12 @@
+@@ -30962,12 +33605,12 @@
   fi
   if test "$exec_prefix" = NONE; then
    ac_kde_exec_prefix="$ac_kde_prefix"
@@ -35473,7 +36161,7 @@
   fi
  
   kde_libraries="${libdir}"
-@@ -30976,8 +33537,8 @@
+@@ -30976,8 +33619,8 @@
  else
    ac_cv_have_kde="have_kde=yes \
      ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -35484,7 +36172,7 @@
  
    kde_libraries="$ac_kde_libraries"
    kde_includes="$ac_kde_includes"
-@@ -31015,8 +33576,8 @@
+@@ -31015,8 +33658,8 @@
  
  if test x$ac_uic_supports_libpath = xyes; then
  
@@ -35495,7 +36183,7 @@
  if test "${kde_cv_uic_plugins+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -31059,8 +33620,8 @@
+@@ -31059,8 +33702,8 @@
  fi
  
  
@@ -35506,7 +36194,7 @@
  if test "$kde_cv_uic_plugins" != yes; then
  	{ { echo "$as_me:$LINENO: error:
  you need to install kdelibs first.
-@@ -31092,10 +33653,9 @@
+@@ -31092,10 +33735,9 @@
  
  
  
@@ -35519,7 +36207,7 @@
    if test "$enableval" = "no";
      then ac_use_path_checking="default"
      else ac_use_path_checking=""
-@@ -31109,13 +33669,14 @@
+@@ -31109,13 +33751,14 @@
    fi
  
  
@@ -35537,7 +36225,7 @@
  kde_result=""
  kde_cached_paths=yes
  if test "${kde_cv_all_paths+set}" = set; then
-@@ -31226,15 +33787,14 @@
+@@ -31226,15 +33869,14 @@
  else
  
    if test $kde_qtver = 1; then
@@ -35558,7 +36246,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31286,8 +33846,8 @@
+@@ -31286,8 +33928,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -35569,7 +36257,7 @@
   else
     { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
  Check, if you installed the KDE header files correctly.
-@@ -31326,8 +33886,8 @@
+@@ -31326,8 +33968,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -35580,7 +36268,7 @@
  ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
  
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31335,8 +33895,8 @@
+@@ -31335,8 +33977,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -35591,7 +36279,7 @@
  else
    { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
  Check, if your compiler is installed correctly and if you have used the
-@@ -31529,15 +34089,14 @@
+@@ -31529,15 +34171,14 @@
  else
  
    if test $kde_qtver = 1; then
@@ -35612,7 +36300,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31589,8 +34148,8 @@
+@@ -31589,8 +34230,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -35623,7 +36311,7 @@
   else
     { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
  Check, if you installed the KDE header files correctly.
-@@ -31629,8 +34188,8 @@
+@@ -31629,8 +34270,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -35634,7 +36322,7 @@
  ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
  
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31638,8 +34197,8 @@
+@@ -31638,8 +34279,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -35645,7 +36333,7 @@
  else
    { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
  Check, if your compiler is installed correctly and if you have used the
-@@ -31731,22 +34290,22 @@
+@@ -31731,22 +34372,22 @@
     { (exit 1); exit 1; }; }
  else
    rm -f conftest*
@@ -35674,7 +36362,7 @@
  
  
  if test "$build_arts" '!=' "no"; then
-@@ -31779,14 +34338,14 @@
+@@ -31779,14 +34420,14 @@
  
          kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
  
@@ -35692,7 +36380,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31829,8 +34388,8 @@
+@@ -31829,8 +34470,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35703,7 +36391,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
  Please check whether you installed KDE correctly.
-@@ -31841,21 +34400,21 @@
+@@ -31841,21 +34482,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35730,7 +36418,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31898,8 +34457,8 @@
+@@ -31898,8 +34539,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35741,7 +36429,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
  Please check whether you installed KDE correctly.
-@@ -31910,22 +34469,22 @@
+@@ -31910,22 +34551,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35769,7 +36457,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31968,8 +34527,8 @@
+@@ -31968,8 +34609,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35780,7 +36468,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
  Please check whether you installed aRts correctly or use
-@@ -31982,21 +34541,21 @@
+@@ -31982,21 +34623,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35807,7 +36495,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32039,8 +34598,8 @@
+@@ -32039,8 +34680,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35818,7 +36506,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
  Please check whether you installed aRts correctly or use
-@@ -32053,22 +34612,22 @@
+@@ -32053,22 +34694,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35846,7 +36534,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32111,12 +34670,12 @@
+@@ -32111,12 +34752,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35863,7 +36551,7 @@
        MEINPROC=$kde_cv_path
  
     fi
-@@ -32145,14 +34704,14 @@
+@@ -32145,14 +34786,14 @@
  
          if test -n "$kde32ornewer"; then
  
@@ -35881,7 +36569,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32195,8 +34754,8 @@
+@@ -32195,8 +34836,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35892,7 +36580,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
  Please check whether you installed KDE correctly.
-@@ -32207,21 +34766,21 @@
+@@ -32207,21 +34848,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35919,7 +36607,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32264,8 +34823,8 @@
+@@ -32264,8 +34905,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35930,7 +36618,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
  Please check whether you installed KDE correctly.
-@@ -32276,8 +34835,8 @@
+@@ -32276,8 +34917,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35941,7 +36629,7 @@
        DCOPIDLNG=$kde_cv_path
  
     fi
-@@ -32285,14 +34844,14 @@
+@@ -32285,14 +34926,14 @@
          fi
          if test -n "$kde33ornewer"; then
  
@@ -35959,7 +36647,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32335,8 +34894,8 @@
+@@ -32335,8 +34976,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35970,7 +36658,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
  Please check whether you installed KDE correctly.
-@@ -32347,8 +34906,8 @@
+@@ -32347,8 +34988,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35981,7 +36669,7 @@
        MAKEKDEWIDGETS=$kde_cv_path
  
     fi
-@@ -32356,14 +34915,14 @@
+@@ -32356,14 +34997,14 @@
  
          fi
  
@@ -35999,7 +36687,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32406,12 +34965,12 @@
+@@ -32406,12 +35047,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36016,74 +36704,227 @@
        XMLLINT=$kde_cv_path
  
     fi
-@@ -32426,7 +34985,7 @@
+@@ -32426,7 +35067,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
 -    echo "configure: 32429: $i/$j" >&5
-+    echo "configure: 34988: $i/$j" >&5
++    echo "configure: 35070: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32587,13 +35146,12 @@
+@@ -32449,207 +35090,772 @@
  
  
  
--  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
+-        fi
++        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
+ 
+ 
+ 
+ 
 +  { 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'
-@@ -32614,13 +35172,13 @@
- 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'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
--      echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++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
+ 
 +      { 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
-@@ -32640,16 +35198,217 @@
++      { 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_have_gcc_visibility=no
++      kde_stdc_visibility_patched=no
++fi
++rm -f conftest*
  
--echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
--echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
+ 
++    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: 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__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
-+
-+
+ 
+ 
 +   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
@@ -36092,7 +36933,7 @@
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
-+
+ 
 +int
 +main ()
 +{
@@ -36139,11 +36980,11 @@
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
+ 
+ 
 +fi
-+
-+rm -f core conftest.err conftest.$ac_objext \
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +  CXXFLAGS="$save_CXXFLAGS"
 +  ac_ext=c
@@ -36151,57 +36992,74 @@
 +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
-+
-+
+ 
+-kdeinitdir='$(kde_moduledir)'
+ 
 +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; }
 + :
-+
+ 
+-if test "$kde_qtver" = 1; then
+-  kde_minidir="$kde_icondir/mini"
 +      kde_have_gcc_visibility=yes
 +                              # Check whether --enable-gcc-hidden-visibility was given.
 +if test "${enable_gcc_hidden_visibility+set}" = set; then
 +  enableval=$enable_gcc_hidden_visibility; kde_have_gcc_visibility=$enableval
-+else
+ else
+-# for KDE 1 - this breaks KDE2 apps using minidir, but
+-# that's the plan ;-/
+-  kde_minidir="/dev/null"
 +  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; }
 +if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
-+
-+
+ 
+ 
 +           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 $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"
 +          safe_CXXFLAGS=$CXXFLAGS
 +          CXXFLAGS="$CXXFLAGS $all_includes"
-+
+ 
+-   LIB_KIO="-lkio"
 +          cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
-+
+ 
+-   LIB_KJS="-lkjs"
 +#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
-+
+ 
+-   LIB_SMB="-lsmb"
 +int
 +main ()
 +{
@@ -36248,61 +37106,75 @@
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-   LIB_KAB="-lkab"
 +	kde_cv_val_qt_gcc_visibility_patched=yes
 +fi
-+
+ 
+-   LIB_KABC="-lkabc"
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+ 
+-   LIB_KHTML="-lkhtml"
 +          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
-+
-+
-+
+ 
+-   LIB_KSPELL="-lkspell"
+ 
+-   LIB_KPARTS="-lkparts"
+ 
+-   LIB_KDEPRINT="-lkdeprint"
 +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; }
-+
+ 
+-   LIB_KUTILS="-lkutils"
 +      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"
-+
+ 
+-   LIB_KDEPIM="-lkdepim"
 +    { 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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
  
+-   LIB_KIMPROXY="-lkimproxy"
  
--
--   ac_ext=cc
+-   LIB_KNEWSTUFF="-lknewstuff"
 +         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'
-@@ -32658,175 +35417,448 @@
- 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'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
+-   LIB_KDNSSD="-lkdnssd"
++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
-+
+-   LIB_KUNITTEST="-lkunittest"
+ 
+-# these are for backward compatibility
+-   LIB_KSYCOCA="-lkio"
+ 
+-   LIB_KFILE="-lkio"
 +        safe_CXXFLAGS=$CXXFLAGS
 +        safe_LDFLAGS=$LDFLAGS
 +        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
 +        LDFLAGS="$LDFLAGS -shared -fPIC"
-+
+ 
+-elif test $kde_qtver = 2; then
+-   LIB_KDECORE="-lkdecore"
 +        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.  */
  
+-   LIB_KDEUI="-lkdeui"
 +          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
 +	  #include <string>
 +          int some_function( void ) __attribute__ ((visibility("default")));
@@ -36311,19 +37183,17 @@
 +	    std::string s("blafasel");
 +            return 0;
 +          }
-+
- int
- main ()
- {
-- return 0;
+ 
+-   LIB_KIO="-lkio"
++int
++main ()
++{
 +/* elvis is alive */
-   ;
-   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
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -36331,16 +37201,12 @@
 +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
-   (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=$?
++  grep -v '^ *+' conftest.er1 >conftest.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'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -36348,95 +37214,82 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (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); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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"
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
 +  kde_cv_val_gcc_visibility_bug=no
- 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
++
 +	kde_cv_val_gcc_visibility_bug=yes
- fi
--rm -f conftest.err conftest.$ac_objext \
++fi
 +
-+rm -f core conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
--  CXXFLAGS="$save_CXXFLAGS"
--  ac_ext=c
++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
++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
  
+-   LIB_KSYCOCA="-lksycoca"
  
-+
- fi
+-   LIB_SMB="-lsmb"
+ 
+-   LIB_KFILE="-lkfile"
++fi
 +{ echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
 +echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; }
  
--if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- :
+-   LIB_KAB="-lkab"
 +    if test x$kde_cv_val_gcc_visibility_bug = xno; then
 +      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
 +    fi
  
--      kde_have_gcc_visibility=yes
--                              # Check whether --enable-gcc-hidden-visibility or --disable-gcc-hidden-visibility was given.
--if test "${enable_gcc_hidden_visibility+set}" = set; then
--  enableval="$enable_gcc_hidden_visibility"
--  kde_have_gcc_visibility=$enableval
--else
--  kde_have_gcc_visibility=no
--fi;
+-   LIB_KHTML="-lkhtml"
  
--      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
+-   LIB_KSPELL="-lkspell"
 +        HAVE_GCC_VISIBILITY=1
-+
+ 
+-   LIB_KPARTS="-lkparts"
 +cat >>confdefs.h <<_ACEOF
 +#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
 +_ACEOF
-+
+ 
+-   LIB_KDEPRINT="-lkdeprint"
 +      fi
-+
+ 
  else
+-   LIB_KDECORE="-lkdecore -lXext $(LIB_QT)"
+-
+-   LIB_KDEUI="-lkdeui $(LIB_KDECORE)"
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 + :
  
+-   LIB_KFM="-lkfm $(LIB_KDECORE)"
 +fi
  
+-   LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)"
 +  fi
  
--           ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-   LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)"
  
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-fi
 +DO_NOT_COMPILE="$DO_NOT_COMPILE kappgen kstartperf"
 +CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
  
@@ -36478,49 +37331,79 @@
 +echo "${ECHO_T}no" >&6; }
 +fi
  
--          safe_CXXFLAGS=$CXXFLAGS
--          CXXFLAGS="$CXXFLAGS $all_includes"
+-#MIN_CONFIG
  
--          cat >conftest.$ac_ext <<_ACEOF
 +  test -n "$LEX" && break
 +done
 +test -n "$LEX" || LEX=":"
-+
-+if test -z "$LEXLIB"
-+then
-+  { echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
-+echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_fl_yywrap+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lfl  $LIBS"
-+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 */
-+/* 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 yywrap ();
++if test "x$LEX" != "x:"; then
++  cat >conftest.l <<_ACEOF
++%%
++a { ECHO; }
++b { REJECT; }
++c { yymore (); }
++d { yyless (1); }
++e { yyless (input () != 0); }
++f { unput (yytext[0]); }
++. { BEGIN INITIAL; }
++%%
++#ifdef YYTEXT_POINTER
++extern char *yytext;
++#endif
 +int
-+main ()
++main (void)
 +{
-+return yywrap ();
-+  ;
-+  return 0;
++  return ! yylex () + ! yywrap ();
 +}
 +_ACEOF
++{ (ac_try="$LEX conftest.l"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$LEX conftest.l") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ echo "$as_me:$LINENO: checking lex output file root" >&5
++echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
++if test "${ac_cv_prog_lex_root+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ 
++if test -f lex.yy.c; then
++  ac_cv_prog_lex_root=lex.yy
++elif test -f lexyy.c; then
++  ac_cv_prog_lex_root=lexyy
++else
++  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
++echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
++echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
++LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+ 
+-  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 -z "${LEXLIB+set}"; then
++  { echo "$as_me:$LINENO: checking lex library" >&5
++echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
++if test "${ac_cv_lib_lex+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ 
+-  if test "x$GXX" = "xyes"; then
++    ac_save_LIBS=$LIBS
++    ac_cv_lib_lex='none needed'
++    for ac_lib in '' -lfl -ll; do
++      LIBS="$ac_lib $ac_save_LIBS"
++      cat >conftest.$ac_ext <<_ACEOF
++`cat $LEX_OUTPUT_ROOT.c`
++_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
@@ -36555,180 +37438,61 @@
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
-+  ac_cv_lib_fl_yywrap=yes
++  ac_cv_lib_lex=$ac_lib
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_fl_yywrap=no
-+fi
-+
-+rm -f core 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_fl_yywrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6; }
-+if test $ac_cv_lib_fl_yywrap = yes; then
-+  LEXLIB="-lfl"
-+else
-+  { echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
-+echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_l_yywrap+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ll  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char yywrap ();
- int
- main ()
- {
--/* elvis is alive */
-+return yywrap ();
-   ;
-   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 conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+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
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_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_val_qt_gcc_visibility_patched=no
-+  ac_cv_lib_l_yywrap=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
  
--kde_cv_val_qt_gcc_visibility_patched=yes
-+	ac_cv_lib_l_yywrap=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-     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
++fi
  
--          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
-+rm -f core conftest.err conftest.$ac_objext \
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
++      test "$ac_cv_lib_lex" != 'none needed' && break
++    done
++    LIBS=$ac_save_LIBS
+ 
 +fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6; }
-+if test $ac_cv_lib_l_yywrap = yes; then
-+  LEXLIB="-ll"
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
++echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
++  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
 +fi
-+
-+fi
-+
-+fi
-+
-+if test "x$LEX" != "x:"; then
-+  { echo "$as_me:$LINENO: checking lex output file root" >&5
-+echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_lex_root+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # The minimal lex program is just a single line: %%.  But some broken lexes
-+# (Solaris, I think it was) want two %% lines, so accommodate them.
-+cat >conftest.l <<_ACEOF
-+%%
-+%%
-+_ACEOF
-+{ (ac_try="$LEX conftest.l"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$LEX conftest.l") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+if test -f lex.yy.c; then
-+  ac_cv_prog_lex_root=lex.yy
-+elif test -f lexyy.c; then
-+  ac_cv_prog_lex_root=lexyy
-+else
-+  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-+echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-+echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
-+rm -f conftest.l
-+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-+
+ 
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+- #include <exception>
+ 
 +{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
 +echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
 +if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
 +  # POSIX says lex can declare yytext either as a pointer or an array; the
-+# default is implementation-dependent. Figure out which it is, since
++# default is implementation-dependent.  Figure out which it is, since
 +# not all implementations provide the %pointer and %array declarations.
 +ac_cv_prog_lex_yytext_pointer=no
-+echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 +ac_save_LIBS=$LIBS
-+LIBS="$LIBS $LEXLIB"
++LIBS="$LEXLIB $ac_save_LIBS"
 +cat >conftest.$ac_ext <<_ACEOF
++#define YYTEXT_POINTER 1
 +`cat $LEX_OUTPUT_ROOT.c`
-+_ACEOF
+ _ACEOF
+-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
+-      kde_stdc_visibility_patched=yes
 +rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
@@ -36764,37 +37528,49 @@
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_prog_lex_yytext_pointer=yes
-+else
+ 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: 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;}
  
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext \
+-      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
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_save_LIBS
-+rm -f "${LEX_OUTPUT_ROOT}.c"
  
- 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
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
 +echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
 +if test $ac_cv_prog_lex_yytext_pointer = yes; then
  
--      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_have_gcc_visibility=no
 +cat >>confdefs.h <<\_ACEOF
 +#define YYTEXT_POINTER 1
 +_ACEOF
  
--    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 "$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__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 +fi
++rm -f conftest.l $LEX_OUTPUT_ROOT.c
  
 +fi
 +if test "$LEX" = :; then
@@ -36802,22 +37578,18 @@
 +fi
  
  
--         ac_ext=cc
+-   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'
-@@ -32835,71 +35867,167 @@
+@@ -32658,335 +35864,325 @@
  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
+-  save_CXXFLAGS="$CXXFLAGS"
+-  CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+-  cat >conftest.$ac_ext <<_ACEOF
 +if test "${ac_cv_header_FlexLexer_h+set}" = set; then
 +  { echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
 +echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
@@ -36837,19 +37609,10 @@
  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;
 -  ;
 -  return 0;
 -}
@@ -36900,21 +37663,15 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  kde_cv_val_gcc_visibility_bug=no
+-  eval "kde_cv_prog_cxx_$kde_cache=yes"
 +  ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_val_gcc_visibility_bug=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
 +	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
- 
--        CXXFLAGS=$safe_CXXFLAGS
--        LDFLAGS=$safe_LDFLAGS
--        ac_ext=c
++fi
++
 +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; }
@@ -36954,12 +37711,16 @@
 +fi
 +if test -z "$ac_cpp_err"; then
 +  ac_header_preproc=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_header_preproc=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  CXXFLAGS="$save_CXXFLAGS"
+-  ac_ext=c
 +
 +rm -f conftest.err conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -37016,33 +37777,47 @@
  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'
-@@ -32907,86 +36035,157 @@
+ 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_have_gcc_visibility=yes
+-                              # Check whether --enable-gcc-hidden-visibility or --disable-gcc-hidden-visibility was given.
+-if test "${enable_gcc_hidden_visibility+set}" = set; then
+-  enableval="$enable_gcc_hidden_visibility"
+-  kde_have_gcc_visibility=$enableval
 +# Check whether --with-berkeley-db was given.
 +if test "${with_berkeley_db+set}" = set; then
 +  withval=$with_berkeley_db;
-+else
+ else
+-  kde_have_gcc_visibility=no
+-fi;
 +  with_berkeley_db=check
- fi
--echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
--echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
++fi
  
--    if test x$kde_cv_val_gcc_visibility_bug = xno; then
--      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
--    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
+-if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
  
 +LIB_DBIV=""
 +if test "x$with_berkeley_db" != xno; then
  
--        HAVE_GCC_VISIBILITY=1
 +{ echo "$as_me:$LINENO: checking for Berkeley Database IV" >&5
 +echo $ECHO_N "checking for Berkeley Database IV... $ECHO_C" >&6; }
  
--cat >>confdefs.h <<_ACEOF
--#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
--_ACEOF
+-           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
 +db_libraries=""
 +db_includes=""
 +db_name=""
@@ -37051,107 +37826,156 @@
 +ac_db_libraries=""
 +ac_db_include_file="db.h"
  
--      fi
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- :
 +# Check whether --with-db-dir was given.
 +if test "${with_db_dir+set}" = set; then
 +  withval=$with_db_dir;   ac_db_includes=-I"$withval"/include
 +       ac_db_libraries=-L"$withval"/lib
  
- fi
++fi
  
--  fi
+-          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.  */
 +# Check whether --with-db-include-dir was given.
 +if test "${with_db_include_dir+set}" = set; then
 +  withval=$with_db_include_dir;   ac_db_includes=-I"$withval"
  
--DO_NOT_COMPILE="$DO_NOT_COMPILE kappgen kstartperf"
--CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+-#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
 +fi
  
--for ac_prog in flex lex
--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_LEX+set}" = set; then
-+
+-int
+-main ()
+-{
+-/* elvis is alive */
+-  ;
+-  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_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
+-  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
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +# Check whether --with-db-include was given.
 +if test "${with_db_include+set}" = set; then
 +  withval=$with_db_include;   ac_db_include_file=-I"$withval"
-+
+ 
+-          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
-+
-+
+ 
+ 
 +# Check whether --with-db-lib-dir was given.
 +if test "${with_db_lib_dir+set}" = set; then
 +  withval=$with_db_lib_dir;   ac_db_libraries=-L"$withval"
-+
-+fi
-+
-+
+ 
+ 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
+ 
+-      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
+-if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 +# Check whether --with-db-name was given.
 +if test "${with_db_name+set}" = set; then
 +  withval=$with_db_name;   ac_db_name="$withval"
-+
+ 
 +fi
-+
-+
-+
-+
+ 
+ 
+-         ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
 +if test "${kde_cv_berk_database+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if test -n "$LEX"; then
--  ac_cv_prog_LEX="$LEX" # 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_LEX="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
  
--fi
--fi
--LEX=$ac_cv_prog_LEX
--if test -n "$LEX"; then
--  echo "$as_me:$LINENO: result: $LEX" >&5
--echo "${ECHO_T}$LEX" >&6
 +kde_safe_LDFLAGS=$LDFLAGS
 +kde_db_safe_LIBS=$LIBS
 +LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $all_libraries $ac_db_libraries $all_includes $ac_db_includes"
-+
+ 
+-        safe_CXXFLAGS=$CXXFLAGS
+-        safe_LDFLAGS=$LDFLAGS
+-        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
+-        LDFLAGS="$LDFLAGS -shared -fPIC"
 +kde_cv_berk_database=NO
 +if test "xNO" = "x$kde_cv_berk_database" ; then
-+
+ 
+-        cat >conftest.$ac_ext <<_ACEOF
 +LIBS="$kde_db_safe -l$ac_db_name"
 +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.  */
+ 
+-          /* 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;
+-          }
 +#include <$ac_db_include_file>
+ 
+ int
+ main ()
+ {
+-/* elvis is alive */
 +
-+int
-+main ()
-+{
-+
 +#if DB_VERSION_MAJOR == 4
 +DB *db;
 +#if DB_VERSION_MINOR > 0
@@ -37163,11 +37987,13 @@
 +error
 +#endif
 +
-+  ;
-+  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;;
@@ -37175,12 +38001,16 @@
 +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
-+  (exit $ac_status); } &&
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -37188,21 +38018,105 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; 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=yes
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      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
+-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
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- :
+-
+-fi
+-
+-  fi
+-
+-
+-DO_NOT_COMPILE="$DO_NOT_COMPILE kappgen kstartperf"
+-CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+-
+-for ac_prog in flex lex
+-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_LEX+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$LEX"; then
+-  ac_cv_prog_LEX="$LEX" # 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_LEX="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
 +  (exit $ac_status); }; }; then
 +  kde_cv_berk_database=$ac_db_name
-+
+ 
+-fi
+-fi
+-LEX=$ac_cv_prog_LEX
+-if test -n "$LEX"; then
+-  echo "$as_me:$LINENO: result: $LEX" >&5
+-echo "${ECHO_T}$LEX" >&6
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
@@ -37215,7 +38129,7 @@
 -  test -n "$LEX" && break
 -done
 -test -n "$LEX" || LEX=":"
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
  
 -if test -z "$LEXLIB"
@@ -37234,7 +38148,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -32994,66 +36193,77 @@
+@@ -32994,66 +36190,77 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37321,7 +38235,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core 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
 +
@@ -37344,7 +38258,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33061,163 +36271,261 @@
+@@ -33061,163 +36268,261 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37441,7 +38355,7 @@
  fi
  
 -fi
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
  
 -if test "x$LEX" != "x:"; then
@@ -37469,8 +38383,8 @@
 -  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
 -echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
 -   { (exit 1); exit 1; }; }
+-fi
  fi
--fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
 -echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
 -rm -f conftest.l
@@ -37569,20 +38483,29 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+
-+fi
-+
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_save_LIBS
+-rm -f "${LEX_OUTPUT_ROOT}.c"
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
+-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
+-if test $ac_cv_prog_lex_yytext_pointer = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define YYTEXT_POINTER 1
+-_ACEOF
 +LIBS=$kde_db_safe_LIBS
 +LDFLAGS=$kde_safe_LDFLAGS
 +
+ 
+ fi
+ 
 +
-+fi
-+
-+
 +kde_db_header=""
 +DBSEARCHENGINE=dbsearchengine
 +
@@ -37657,22 +38580,13 @@
 +echo "$as_me: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&2;}
 +   { (exit 1); exit 1; }; }
  fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_save_LIBS
--rm -f "${LEX_OUTPUT_ROOT}.c"
--
+-if test "$LEX" = :; then
+-  LEX=${am_missing_run}flex
  fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
--echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
--if test $ac_cv_prog_lex_yytext_pointer = yes; then
  
--cat >>confdefs.h <<\_ACEOF
--#define YYTEXT_POINTER 1
--_ACEOF
  
--fi
  
+- ac_ext=cc
 +
 +
 +
@@ -37685,15 +38599,11 @@
 +else
 +  include_DBSEARCHENGINE_TRUE='#'
 +  include_DBSEARCHENGINE_FALSE=
- fi
--if test "$LEX" = :; then
--  LEX=${am_missing_run}flex
--fi
- 
- 
- 
-- ac_ext=cc
++fi
 +
++
++
++
 +HAVE_KCAL=0
 +
 +   kde_safe_cppflags=$CPPFLAGS
@@ -37703,7 +38613,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33226,18 +36534,18 @@
+@@ -33226,18 +36531,18 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -37730,7 +38640,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33245,27 +36553,39 @@
+@@ -33245,27 +36550,39 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -37779,7 +38689,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33274,25 +36594,31 @@
+@@ -33274,25 +36591,31 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37820,7 +38730,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -33316,1395 +36642,1286 @@
+@@ -33316,703 +36639,834 @@
  
    ac_header_preproc=no
  fi
@@ -37927,8 +38837,11 @@
 -# Check whether --with-berkeley-db or --without-berkeley-db was given.
 -if test "${with_berkeley_db+set}" = set; then
 -  withval="$with_berkeley_db"
--
--else
+ 
++if test "$HAVE_KCAL" = 1; then
++  include_kcalresource_TRUE=
++  include_kcalresource_FALSE='#'
+ else
 -  with_berkeley_db=check
 -fi;
 -
@@ -37968,173 +38881,28 @@
 -    ac_db_include_file=-I"$withval"
 -
 -fi;
--
++  include_kcalresource_TRUE='#'
++  include_kcalresource_FALSE=
++fi
+ 
 -# Check whether --with-db-lib-dir or --without-db-lib-dir was given.
 -if test "${with_db_lib_dir+set}" = set; then
 -  withval="$with_db_lib_dir"
 -    ac_db_libraries=-L"$withval"
--
+ 
 -fi;
--
+ 
 -# Check whether --with-db-name or --without-db-name was given.
 -if test "${with_db_name+set}" = set; then
 -  withval="$with_db_name"
 -    ac_db_name="$withval"
--
++KCACHEGRIND_VERSION=0.4.6kde
+ 
 -fi;
--
--
--
--if test "${kde_cv_berk_database+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--kde_safe_LDFLAGS=$LDFLAGS
--kde_db_safe_LIBS=$LIBS
--LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $all_libraries $ac_db_libraries $all_includes $ac_db_includes"
--
--kde_cv_berk_database=NO
--if test "xNO" = "x$kde_cv_berk_database" ; then
--
--LIBS="$kde_db_safe -l$ac_db_name"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <$ac_db_include_file>
--
--int
--main ()
--{
--
--#if DB_VERSION_MAJOR == 4
--DB *db;
--#if DB_VERSION_MINOR > 0
--db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
--#else
--db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
--#endif
--#else
--error
--#endif
--
--  ;
--  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
--  kde_cv_berk_database=$ac_db_name
  
-+if test "$HAVE_KCAL" = 1; then
-+  include_kcalresource_TRUE=
-+  include_kcalresource_FALSE='#'
- 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
--
--fi
--if test "xNO" = "x$kde_cv_berk_database" ; then
--
--LIBS="$kde_db_safe -ldb4"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <db4/db.h>
--
--int
--main ()
--{
--
--#if DB_VERSION_MAJOR == 4
--DB *db;
--#if DB_VERSION_MINOR > 0
--db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
--#else
--db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
--#endif
--#else
--error
--#endif
--
--  ;
--  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
--  kde_cv_berk_database=db4
-+  include_kcalresource_TRUE='#'
-+  include_kcalresource_FALSE=
-+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_exeext conftest.$ac_ext
- 
--fi
--if test "xNO" = "x$kde_cv_berk_database" ; then
-+KCACHEGRIND_VERSION=0.4.6kde
- 
--LIBS="$kde_db_safe -ldb4"
-+
-+
-+
+-if test "${kde_cv_berk_database+set}" = set; then
 +for ac_header in stdlib.h unistd.h
 +do
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38142,12 +38910,21 @@
 +  { 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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
 +fi
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
+ else
+-
+-kde_safe_LDFLAGS=$LDFLAGS
+-kde_db_safe_LIBS=$LIBS
+-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $all_libraries $ac_db_libraries $all_includes $ac_db_includes"
+-
+-kde_cv_berk_database=NO
+-if test "xNO" = "x$kde_cv_berk_database" ; then
+-
+-LIBS="$kde_db_safe -l$ac_db_name"
 +  # Is the header compilable?
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
@@ -38158,7 +38935,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
 -
--#include <db.h>
+-#include <$ac_db_include_file>
 -
 -int
 -main ()
@@ -38225,7 +39002,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  kde_cv_berk_database=db4-db
+-  kde_cv_berk_database=$ac_db_name
 -
 +  ac_header_compiler=yes
  else
@@ -38243,7 +39020,7 @@
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
  
--LIBS="$kde_db_safe -ldb"
+-LIBS="$kde_db_safe -ldb4"
 +# Is the header present?
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
@@ -38254,7 +39031,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
 -
--#include <db.h>
+-#include <db4/db.h>
 -
 -int
 -main ()
@@ -38305,7 +39082,7 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  kde_cv_berk_database=db
+-  kde_cv_berk_database=db4
 -
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -38323,19 +39100,69 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--fi
++  ac_header_preproc=no
+ fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -
-+  ac_header_preproc=no
- fi
+-fi
+-if test "xNO" = "x$kde_cv_berk_database" ; then
+-
+-LIBS="$kde_db_safe -ldb4"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <db.h>
+-
+-int
+-main ()
+-{
  
--LIBS=$kde_db_safe_LIBS
--LDFLAGS=$kde_safe_LDFLAGS
+-#if DB_VERSION_MAJOR == 4
+-DB *db;
+-#if DB_VERSION_MINOR > 0
+-db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+-#else
+-db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+-#endif
+-#else
+-error
+-#endif
 +rm -f conftest.err conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
  
+-  ;
+-  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
+-  kde_cv_berk_database=db4-db
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 +  yes:no: )
@@ -38365,106 +39192,31 @@
 +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
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  eval "$as_ac_Header=\$ac_header_preproc"
- fi
++fi
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  
--
--kde_db_header=""
--DBSEARCHENGINE=dbsearchengine
--
--case "$kde_cv_berk_database" in
-- NO)
--   echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--   LIB_DBIV=""
--   DBSEARCHENGINE=""
--   ;;
-- db)
--   LIB_DBIV="-l$ac_db_name"
--   kde_db_header=db.h
--   echo "$as_me:$LINENO: result: -l$ac_db_name" >&5
--echo "${ECHO_T}-l$ac_db_name" >&6
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DB_DB_H 1
--_ACEOF
--
--   ;;
-- db4-db)
--   LIB_DBIV='-ldb4'
--   kde_db_header=db.h
--   echo "$as_me:$LINENO: result: \"flag is -ldb4 and header is db.h\"" >&5
--echo "${ECHO_T}\"flag is -ldb4 and header is db.h\"" >&6
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DB_DB_H 1
--_ACEOF
--
--   ;;
-- db4)
--   LIB_DBIV='-ldb4'
--   kde_db_header=db4/db.h
--   echo "$as_me:$LINENO: result: -ldb4" >&5
--echo "${ECHO_T}-ldb4" >&6
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DB4_DB_H 1
--_ACEOF
--
--   ;;
-- $ac_db_name)
--   LIB_DBIV="-l$ac_db_name"
--   kde_db_header="$ac_db_include_file"
--   echo "$as_me:$LINENO: result: user specified $ac_db_name" >&5
--echo "${ECHO_T}user specified $ac_db_name" >&6
--   if test "x$ac_db_include_file" = "xdb.h" ; then
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DB_DB_H 1
--_ACEOF
--
--   else
--
--cat >>confdefs.h <<_ACEOF
--#define USE_DB_H_PATH <$ac_db_include_file>
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
 +  cat >>confdefs.h <<_ACEOF
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
++_ACEOF
  
--   fi
--
--   ;;
--esac
--
--DBIV_LDFLAGS="$ac_db_libraries"
--DBIV_INCLUDES="$ac_db_includes"
--DBIV_NAME="$ac_db_name"
--
--if test "x$with_berkeley_db" != xcheck && test -z "$LIB_DBIV"; then
--  { { echo "$as_me:$LINENO: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&5
--echo "$as_me: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&2;}
--   { (exit 1); exit 1; }; }
--fi
  fi
+-if test "xNO" = "x$kde_cv_berk_database" ; then
  
+-LIBS="$kde_db_safe -ldb"
+-cat >conftest.$ac_ext <<_ACEOF
 +done
- 
- 
--
--
--
--
--
--
--if test -n "$DBSEARCHENGINE"; then
--  include_DBSEARCHENGINE_TRUE=
--  include_DBSEARCHENGINE_FALSE='#'
++
++
 +for ac_func in getpagesize
 +do
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -38472,47 +39224,42 @@
 +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
--  include_DBSEARCHENGINE_TRUE='#'
--  include_DBSEARCHENGINE_FALSE=
--fi
--
--
--
--
--HAVE_KCAL=0
--
--   kde_safe_cppflags=$CPPFLAGS
--   CPPFLAGS="$CPPFLAGS $all_includes"
++else
 +  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.  */
 +/* 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
  
+-#include <db.h>
+-
+-int
+-main ()
+-{
 +/* 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.  */
  
--    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
+-#if DB_VERSION_MAJOR == 4
+-DB *db;
+-#if DB_VERSION_MINOR > 0
+-db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
 +#ifdef __STDC__
 +# include <limits.h>
-+#else
+ #else
+-db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
 +# include <assert.h>
-+#endif
- 
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ #endif
+-#else
+-error
++
 +#undef $ac_func
- 
++
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -38525,40 +39272,19 @@
 +    something starting with __ and the normal name is an alias.  */
 +#if defined __stub_$ac_func || defined __stub___$ac_func
 +choke me
-+#endif
+ #endif
  
--   if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
--echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6
--if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
--echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6
--else
--  # Is the header compilable?
--echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h usability" >&5
--echo $ECHO_N "checking libkcal/resourcecalendar.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 <libkcal/resourcecalendar.h>
 +int
 +main ()
 +{
 +return $ac_func ();
-+  ;
-+  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
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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;;
@@ -38572,7 +39298,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
+-	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
@@ -38586,10 +39312,9 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
+ 	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -s conftest$ac_exeext'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
@@ -38599,26 +39324,25 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  ac_header_compiler=yes
+-  kde_cv_berk_database=db
+-
 +  eval "$as_ac_var=yes"
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_header_compiler=no
 +	eval "$as_ac_var=no"
  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 conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
  
--# Is the header present?
--echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h presence" >&5
--echo $ECHO_N "checking libkcal/resourcecalendar.h presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
-+fi
+ fi
+-
+-LIBS=$kde_db_safe_LIBS
+-LDFLAGS=$kde_safe_LDFLAGS
+-
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
@@ -38626,10 +39350,10 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
-+
-+fi
+ 
+ fi
 +done
-+
+ 
 +{ echo "$as_me:$LINENO: checking for working mmap" >&5
 +echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
 +if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
@@ -38639,16 +39363,17 @@
 +  ac_cv_func_mmap_fixed_mapped=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 <libkcal/resourcecalendar.h>
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
 +$ac_includes_default
 +/* malloc might have been renamed as rpl_malloc. */
 +#undef malloc
-+
+ 
+-kde_db_header=""
+-DBSEARCHENGINE=dbsearchengine
 +/* Thanks to Mike Haertel and Jim Avera for this test.
 +   Here is a matrix of mmap possibilities:
 +	mmap private not fixed
@@ -38665,30 +39390,60 @@
 +   like early versions of FreeBSD and possibly contemporary NetBSD.)
 +   For shared mappings, we should conversely verify that changes get
 +   propagated back to all the places they're supposed to be.
-+
+ 
+-case "$kde_cv_berk_database" in
+- NO)
+-   echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-   LIB_DBIV=""
+-   DBSEARCHENGINE=""
+-   ;;
+- db)
+-   LIB_DBIV="-l$ac_db_name"
+-   kde_db_header=db.h
+-   echo "$as_me:$LINENO: result: -l$ac_db_name" >&5
+-echo "${ECHO_T}-l$ac_db_name" >&6
 +   Grep wants private fixed already mapped.
 +   The main things grep needs to know about mmap are:
 +   * does it exist and is it safe to write into the mmap'd area
 +   * how to use it (BSD variants)  */
-+
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DB_DB_H 1
+-_ACEOF
 +#include <fcntl.h>
 +#include <sys/mman.h>
-+
-+#if !STDC_HEADERS && !HAVE_STDLIB_H
+ 
+-   ;;
+- db4-db)
+-   LIB_DBIV='-ldb4'
+-   kde_db_header=db.h
+-   echo "$as_me:$LINENO: result: \"flag is -ldb4 and header is db.h\"" >&5
+-echo "${ECHO_T}\"flag is -ldb4 and header is db.h\"" >&6
++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
 +char *malloc ();
 +#endif
-+
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DB_DB_H 1
+-_ACEOF
 +/* This mess was copied from the GNU getpagesize.h.  */
-+#if !HAVE_GETPAGESIZE
++#ifndef HAVE_GETPAGESIZE
 +/* Assume that all systems that can run configure have sys/param.h.  */
-+# if !HAVE_SYS_PARAM_H
++# ifndef HAVE_SYS_PARAM_H
 +#  define HAVE_SYS_PARAM_H 1
 +# endif
-+
+ 
+-   ;;
+- db4)
+-   LIB_DBIV='-ldb4'
+-   kde_db_header=db4/db.h
+-   echo "$as_me:$LINENO: result: -ldb4" >&5
+-echo "${ECHO_T}-ldb4" >&6
 +# ifdef _SC_PAGESIZE
 +#  define getpagesize() sysconf(_SC_PAGESIZE)
 +# else /* no _SC_PAGESIZE */
-+#  if HAVE_SYS_PARAM_H
++#  ifdef HAVE_SYS_PARAM_H
 +#   include <sys/param.h>
 +#   ifdef EXEC_PAGESIZE
 +#    define getpagesize() EXEC_PAGESIZE
@@ -38712,18 +39467,32 @@
 +#   define getpagesize() 8192	/* punt totally */
 +#  endif /* no HAVE_SYS_PARAM_H */
 +# endif /* no _SC_PAGESIZE */
-+
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DB4_DB_H 1
+-_ACEOF
 +#endif /* no HAVE_GETPAGESIZE */
-+
+ 
+-   ;;
+- $ac_db_name)
+-   LIB_DBIV="-l$ac_db_name"
+-   kde_db_header="$ac_db_include_file"
+-   echo "$as_me:$LINENO: result: user specified $ac_db_name" >&5
+-echo "${ECHO_T}user specified $ac_db_name" >&6
+-   if test "x$ac_db_include_file" = "xdb.h" ; then
 +int
 +main ()
 +{
 +  char *data, *data2, *data3;
 +  int i, pagesize;
 +  int fd;
-+
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DB_DB_H 1
+-_ACEOF
 +  pagesize = getpagesize ();
-+
+ 
+-   else
 +  /* First, make a file with some known garbage in it. */
 +  data = (char *) malloc (pagesize);
 +  if (!data)
@@ -38737,7 +39506,10 @@
 +  if (write (fd, data, pagesize) != pagesize)
 +    return 1;
 +  close (fd);
-+
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define USE_DB_H_PATH <$ac_db_include_file>
+-_ACEOF
 +  /* Next, try to mmap the file at a fixed address which already has
 +     something else allocated at it.  If we can, also make sure that
 +     we see the same garbage.  */
@@ -38754,7 +39526,8 @@
 +  for (i = 0; i < pagesize; ++i)
 +    if (*(data + i) != *(data2 + i))
 +      return 1;
-+
+ 
+-   fi
 +  /* Finally, make sure that changes to the mapped area do not
 +     percolate back to the file as seen by read().  (This is a bug on
 +     some variants of i386 svr4.0.)  */
@@ -38771,9 +39544,7 @@
 +  close (fd);
 +  return 0;
 +}
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++_ACEOF
 +rm -f conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
@@ -38782,23 +39553,8 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-   ac_status=$?
--  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
--  ac_header_preproc=yes
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -38810,60 +39566,28 @@
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_func_mmap_fixed_mapped=yes
- else
--  echo "$as_me: failed program was:" >&5
++else
 +  echo "$as_me: program exited with status $ac_status" >&5
 +echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
--  ac_header_preproc=no
+-   ;;
+-esac
 +( exit $ac_status )
 +ac_cv_func_mmap_fixed_mapped=no
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
+ 
+-DBIV_LDFLAGS="$ac_db_libraries"
+-DBIV_INCLUDES="$ac_db_includes"
+-DBIV_NAME="$ac_db_name"
+ 
+-if test "x$with_berkeley_db" != xcheck && test -z "$LIB_DBIV"; then
+-  { { echo "$as_me:$LINENO: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&5
+-echo "$as_me: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&2;}
+-   { (exit 1); exit 1; }; }
  fi
--rm -f conftest.err conftest.$ac_ext
--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
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.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
--    ;;
--esac
--echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
--echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6
--if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
 +echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
 +if test $ac_cv_func_mmap_fixed_mapped = yes; then
@@ -38872,29 +39596,26 @@
 +#define HAVE_MMAP 1
 +_ACEOF
 +
-+fi
+ fi
 +rm -f conftest.mmap
-+
-+
-+
-+
+ 
+ 
+ 
+ 
 +# Check whether --with-subversion was given.
 +if test "${with_subversion+set}" = set; then
 +  withval=$with_subversion;
- else
--  ac_cv_header_libkcal_resourcecalendar_h=$ac_header_preproc
++else
 +  with_subversion=check
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
--echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6
++fi
 +
-+
+ 
 +SVN_SUBDIR=""
 +if test "x$with_subversion" != xno; then
-+
+ 
 +APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
 +SVN_SUBDIR="svn"
-+
+ 
 +# Check whether --with-apr-config was given.
 +if test "${with_apr_config+set}" = set; then
 +  withval=$with_apr_config;
@@ -38902,10 +39623,11 @@
 +        APR_CONFIGS=$withval
 +    fi
  
- fi
--if test $ac_cv_header_libkcal_resourcecalendar_h = yes; then
--  HAVE_KCAL=1
-+
++fi
+ 
+-if test -n "$DBSEARCHENGINE"; then
+-  include_DBSEARCHENGINE_TRUE=
+-  include_DBSEARCHENGINE_FALSE='#'
 +{ echo "$as_me:$LINENO: checking for APR" >&5
 +echo $ECHO_N "checking for APR... $ECHO_C" >&6; }
 +APR_CONFIG=""
@@ -38920,10 +39642,8 @@
 +    { echo "$as_me:$LINENO: result: found" >&5
 +echo "${ECHO_T}found" >&6; }
  else
--  { echo "$as_me:$LINENO: WARNING: Unable to find libkcal. The Bugzilla todo list \
-- resource for KOrganizer won't be compiled." >&5
--echo "$as_me: WARNING: Unable to find libkcal. The Bugzilla todo list \
-- resource for KOrganizer won't be compiled." >&2;}
+-  include_DBSEARCHENGINE_TRUE='#'
+-  include_DBSEARCHENGINE_FALSE=
 +    { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
 +	SVN_SUBDIR=
@@ -38933,15 +39653,13 @@
 +APR_INCLUDE="`$APR_CONFIG --includes`"
 +APR_LIBS="`$APR_CONFIG --link-ld --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
  
--   CPPFLAGS=$kde_safe_cppflags
 +APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
  
+-HAVE_KCAL=0
+-
+-   kde_safe_cppflags=$CPPFLAGS
+-   CPPFLAGS="$CPPFLAGS $all_includes"
 +# Check whether --with-apu-config was given.
 +if test "${with_apu_config+set}" = set; then
 +  withval=$with_apu_config;
@@ -38951,9 +39669,11 @@
  
 +fi
  
--if test "$HAVE_KCAL" = 1; then
--  include_kcalresource_TRUE=
--  include_kcalresource_FALSE='#'
+-    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
 +{ echo "$as_me:$LINENO: checking for APR util" >&5
 +echo $ECHO_N "checking for APR util... $ECHO_C" >&6; }
 +APU_CONFIG=""
@@ -38966,16 +39686,15 @@
 +if test $APU_CONFIG ; then
 +    { echo "$as_me:$LINENO: result: found" >&5
 +echo "${ECHO_T}found" >&6; }
- else
--  include_kcalresource_TRUE='#'
--  include_kcalresource_FALSE=
++else
 +    { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
 +	SVN_SUBDIR=
- fi
++fi
 +APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
 +APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
  
+-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 Subversion svn-config" >&5
 +echo $ECHO_N "checking for Subversion svn-config... $ECHO_C" >&6; }
  
@@ -38984,33 +39703,18 @@
 +  withval=$with_subversion_dir;
 +		 SVNCONFIG="$withval/bin/svn-config"
  
--KCACHEGRIND_VERSION=0.4.6kde
-+fi
- 
- 
-+if test -z "$SVNCONFIG"; then
-+	_SVNCONFIG="`svn-config --prefix 2> /dev/null`"
-+	if test -n "$_SVNCONFIG"; then
-+		SVNCONFIG="$_SVNCONFIG/bin/svn-config"
-+	fi
-+fi
- 
- 
--for ac_header in stdlib.h unistd.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 test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
+-echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6
+-if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
 -  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
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6
 -else
 -  # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h usability" >&5
+-echo $ECHO_N "checking libkcal/resourcecalendar.h usability... $ECHO_C" >&6
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -39018,7 +39722,7 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
--#include <$ac_header>
+-#include <libkcal/resourcecalendar.h>
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -39029,7 +39733,7 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
+-	 { 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
@@ -39043,43 +39747,32 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_header_compiler=yes
-+if test -x "$SVNCONFIG"; then
-+	SVNLD="`$SVNCONFIG --ldflags`"
-+	SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
-+	SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
-+		SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
-+	{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+	{ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-+	SVNLD=""
-+		SVN_INCLUDES="/usr/local/include /usr/include"
  
 -ac_header_compiler=no
--fi
++
++if test -z "$SVNCONFIG"; then
++	_SVNCONFIG="`svn-config --prefix 2> /dev/null`"
++	if test -n "$_SVNCONFIG"; then
++		SVNCONFIG="$_SVNCONFIG/bin/svn-config"
++	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
-+# Check whether --with-svn-include was given.
-+if test "${with_svn_include+set}" = set; then
-+  withval=$with_svn_include;
-+				 if test "$withval" != "yes" -a "$withval" != ""; then
-+					 SVN_INCLUDES=$withval
-+				 fi
  
 -# 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 libkcal/resourcecalendar.h presence" >&5
+-echo $ECHO_N "checking libkcal/resourcecalendar.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 <$ac_header>
+-#include <libkcal/resourcecalendar.h>
 -_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -39090,13 +39783,33 @@
 -  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
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 -  else
 -    ac_cpp_err=
 -  fi
--else
++
++if test -x "$SVNCONFIG"; then
++	SVNLD="`$SVNCONFIG --ldflags`"
++	SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
++	SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
++		SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
 -  ac_cpp_err=yes
++	{ echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
++	SVNLD=""
++		SVN_INCLUDES="/usr/local/include /usr/include"
++
++# Check whether --with-svn-include was given.
++if test "${with_svn_include+set}" = set; then
++  withval=$with_svn_include;
++				 if test "$withval" != "yes" -a "$withval" != ""; then
++					 SVN_INCLUDES=$withval
++				 fi
++
  fi
 -if test -z "$ac_cpp_err"; then
 -  ac_header_preproc=yes
@@ -39105,10 +39818,6 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -  ac_header_preproc=no
--fi
--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: checking for Subversion headers" >&5
 +echo $ECHO_N "checking for Subversion headers... $ECHO_C" >&6; }
 +	SVN_INCLUDE=""
@@ -39134,29 +39843,34 @@
 +			     if test "$withval" != "yes" -a "$withval" != ""; then
 +			         SVN_LIBS=$withval
 +			     fi
++
+ fi
+-rm -f conftest.err conftest.$ac_ext
+-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
+-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;}
+-    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: 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;}
+-    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&2;}
 -    (
 -      cat <<\_ASBOX
 -## ------------------------------------------ ##
@@ -39167,16 +39881,12 @@
 -      sed "s/^/$as_me: WARNING:     /" >&2
 -    ;;
 -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 libkcal/resourcecalendar.h" >&5
+-echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6
+-if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
 -  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_cv_header_libkcal_resourcecalendar_h=$ac_header_preproc
 +	{ echo "$as_me:$LINENO: checking for Subversion libraries" >&5
 +echo $ECHO_N "checking for Subversion libraries... $ECHO_C" >&6; }
 +	SVN_LIB=""
@@ -39195,10 +39905,8 @@
 +		SVN_SUBDIR=
 +	fi
  fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
+-echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6
 +SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
 +SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
 +SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
@@ -39207,62 +39915,31 @@
 +  { { echo "$as_me:$LINENO: error: --with-subversion was given, but test for subversion failed" >&5
 +echo "$as_me: error: --with-subversion was given, but test for subversion failed" >&2;}
 +   { (exit 1); exit 1; }; }
-+fi
  fi
+-if test $ac_cv_header_libkcal_resourcecalendar_h = yes; then
+-  HAVE_KCAL=1
+-else
+-  { echo "$as_me:$LINENO: WARNING: Unable to find libkcal. The Bugzilla todo list \
+- resource for KOrganizer won't be compiled." >&5
+-echo "$as_me: WARNING: Unable to find libkcal. The Bugzilla todo list \
+- resource for KOrganizer won't be compiled." >&2;}
+ fi
  
--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
  
--for ac_func in getpagesize
--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 $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
+-   CPPFLAGS=$kde_safe_cppflags
  
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
  
--#undef $ac_func
- 
--/* Override any 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 $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
--#endif
+-if test "$HAVE_KCAL" = 1; then
+-  include_kcalresource_TRUE=
+-  include_kcalresource_FALSE='#'
++
 +if test -n "$SVN_SUBDIR"; then
 +  include_kioslave_svn_TRUE=
 +  include_kioslave_svn_FALSE='#'
@@ -39283,26 +39960,128 @@
 +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 { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++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
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_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_compile_kmtrace=$GCC
+ else
+-  include_kcalresource_TRUE='#'
+-  include_kcalresource_FALSE=
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	kde_compile_kmtrace=no
+ fi
  
- int
- main ()
- {
--return f != $ac_func;
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++      KMTRACE_LIBS=$LIBS
+ 
++      LIBS="$saved_LIBS"
++      ;;
++   *)
++      kde_compile_kmtrace=no
++      ;;
++esac
+ 
+-KCACHEGRIND_VERSION=0.4.6kde
++if test ! "x$kde_compile_kmtrace" = "xyes"; then
++   DO_NOT_COMPILE="$DO_NOT_COMPILE kmtrace"
++fi
+ 
+ 
++ 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 stdlib.h unistd.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
 +
-   ;
-   return 0;
- }
++if test "${ac_cv_header_FlexLexer_h+set}" = set; then
++  { echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
++echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_FlexLexer_h+set}" = set; then
+   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
++{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
++echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
++echo $ECHO_N "checking FlexLexer.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
  _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"
+@@ -34020,27 +37474,39 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <$ac_header>
++#include <FlexLexer.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;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
++  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
@@ -39313,7 +40092,7 @@
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
@@ -39323,7 +40102,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+ 	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
@@ -39335,76 +40114,280 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  eval "$as_ac_var=yes"
-+  kde_compile_kmtrace=$GCC
- else
+@@ -34049,25 +37515,31 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--eval "$as_ac_var=no"
-+	kde_compile_kmtrace=no
+-ac_header_compiler=no
++	ac_header_compiler=no
  fi
--rm -f conftest.err conftest.$ac_objext \
+-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_exeext conftest.$ac_ext
++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?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
++echo $ECHO_N "checking FlexLexer.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 <$ac_header>
++#include <FlexLexer.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;;
++  *) ac_try_echo=$ac_try;;
++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
+@@ -34075,8 +37547,8 @@
+   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
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+   else
+     ac_cpp_err=
+   fi
+@@ -34091,867 +37563,456 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ 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
++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;}
++    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: FlexLexer.h: 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;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: FlexLexer.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: FlexLexer.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: FlexLexer.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
++
+     ;;
+ 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 FlexLexer.h" >&5
++echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_FlexLexer_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  eval "$as_ac_Header=\$ac_header_preproc"
++  ac_cv_header_FlexLexer_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
++echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&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
+-
++if test $ac_cv_header_FlexLexer_h = yes; then
++  kde_have_flex=yes
++else
++  kde_have_flex=no
+ fi
+ 
+-done
+-
+-
+-for ac_func in getpagesize
+-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 $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
++if test "$kde_have_flex" = "no"; then
++  DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
++fi
+ 
+-#undef $ac_func
+ 
+-/* 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 $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
++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
+ 
+-int
+-main ()
+-{
+-return f != $ac_func;
+-  ;
+-  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
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
 -fi
+-rm -f conftest.err conftest.$ac_objext \
+-      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
 -if test `eval echo '${'$as_ac_var'}'` = yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
-+      KMTRACE_LIBS=$LIBS
-+
-+      LIBS="$saved_LIBS"
-+      ;;
-+   *)
-+      kde_compile_kmtrace=no
-+      ;;
-+esac
  
-+if test ! "x$kde_compile_kmtrace" = "xyes"; then
-+   DO_NOT_COMPILE="$DO_NOT_COMPILE kmtrace"
- fi
+-fi
 -done
  
 -echo "$as_me:$LINENO: checking for working mmap" >&5
 -echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; 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
-+
-+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_FlexLexer_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
-+echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_FlexLexer_h+set}" = set; then
++for ac_func in setenv
++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 { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
-+echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
- else
+-else
 -  if test "$cross_compiling" = yes; then
 -  ac_cv_func_mmap_fixed_mapped=no
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
-+echo $ECHO_N "checking FlexLexer.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
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
 -/* malloc might have been renamed as rpl_malloc. */
 -#undef malloc
 -
@@ -39429,14 +40412,32 @@
 -   The main things grep needs to know about mmap are:
 -   * does it exist and is it safe to write into the mmap'd area
 -   * how to use it (BSD variants)  */
--
++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
+ 
 -#include <fcntl.h>
 -#include <sys/mman.h>
--
++/* 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.  */
+ 
 -#if !STDC_HEADERS && !HAVE_STDLIB_H
 -char *malloc ();
--#endif
--
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
+ #endif
+ 
 -/* This mess was copied from the GNU getpagesize.h.  */
 -#if !HAVE_GETPAGESIZE
 -/* Assume that all systems that can run configure have sys/param.h.  */
@@ -39471,12 +40472,26 @@
 -#   define getpagesize() 8192	/* punt totally */
 -#  endif /* no HAVE_SYS_PARAM_H */
 -# endif /* no _SC_PAGESIZE */
--
++#undef $ac_func
+ 
 -#endif /* no HAVE_GETPAGESIZE */
--
--int
--main ()
--{
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_$ac_func || defined __stub___$ac_func
++choke me
++#endif
+ 
+ int
+ main ()
+ {
 -  char *data, *data2, *data3;
 -  int i, pagesize;
 -  int fd;
@@ -39529,40 +40544,42 @@
 -      exit (1);
 -  close (fd);
 -  exit (0);
--}
-+#include <FlexLexer.h>
++return $ac_func ();
++  ;
++  return 0;
+ }
  _ACEOF
 -rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
++  (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='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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
 +  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -s conftest$ac_exeext'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
@@ -39573,7 +40590,7 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  ac_cv_func_mmap_fixed_mapped=yes
-+  ac_header_compiler=yes
++  eval "$as_ac_var=yes"
  else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
@@ -39584,26 +40601,32 @@
 -ac_cv_func_mmap_fixed_mapped=no
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++	eval "$as_ac_var=no"
+ fi
 -fi
--fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
 -echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 -if test $ac_cv_func_mmap_fixed_mapped = yes; then
--
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_MMAP 1
--_ACEOF
--
-+	ac_header_compiler=no
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++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
 -rm -f conftest.mmap
 -
 -
- 
-+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; }
- 
+-
+-
 -# Check whether --with-subversion or --without-subversion was given.
 -if test "${with_subversion+set}" = set; then
 -  withval="$with_subversion"
@@ -39635,105 +40658,36 @@
 -		APR_CONFIG=$VALUE
 -		break
 -	fi
--done
+ done
 -test $VALUE && APR_CONFIG=$VALUE
 -if test $APR_CONFIG ; then
 -    echo "$as_me:$LINENO: result: found" >&5
 -echo "${ECHO_T}found" >&6
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
-+echo $ECHO_N "checking FlexLexer.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 <FlexLexer.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/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
+-else
 -    echo "$as_me:$LINENO: result: not found" >&5
 -echo "${ECHO_T}not found" >&6
 -	SVN_SUBDIR=
-+  ac_cpp_err=yes
- fi
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+-fi
  
 -APR_CPPFLAGS="`$APR_CONFIG --cppflags`"
 -APR_INCLUDE="`$APR_CONFIG --includes`"
 -APR_LIBS="`$APR_CONFIG --link-ld --libs`"
--
-+  ac_header_preproc=no
-+fi
  
+ 
 -APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
  
 -# Check whether --with-apu-config or --without-apu-config was given.
 -if test "${with_apu_config+set}" = set; then
 -  withval="$with_apu_config"
-+# 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: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: FlexLexer.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: FlexLexer.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: FlexLexer.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: FlexLexer.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
  
 -    if test "$withval" != "yes" -a "$withval" != ""; then
 -        APU_CONFIGS=$withval
 -    fi
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
-+echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_FlexLexer_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_FlexLexer_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
-+echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
++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;
 -echo "$as_me:$LINENO: checking for APR util" >&5
@@ -39748,29 +40702,27 @@
 -if test $APU_CONFIG ; then
 -    echo "$as_me:$LINENO: result: found" >&5
 -echo "${ECHO_T}found" >&6
-+fi
-+if test $ac_cv_header_FlexLexer_h = yes; then
-+  kde_have_flex=yes
- else
+-else
 -    echo "$as_me:$LINENO: result: not found" >&5
 -echo "${ECHO_T}not found" >&6
 -	SVN_SUBDIR=
-+  kde_have_flex=no
- fi
+-fi
 -APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
 -APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
  
 -echo "$as_me:$LINENO: checking for Subversion svn-config" >&5
 -echo $ECHO_N "checking for Subversion svn-config... $ECHO_C" >&6
++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
  
 -# Check whether --with-subversion-dir or --without-subversion-dir was given.
 -if test "${with_subversion_dir+set}" = set; then
 -  withval="$with_subversion_dir"
  
 -		 SVNCONFIG="$withval/bin/svn-config"
-+if test "$kde_have_flex" = "no"; then
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
-+fi
  
 -fi;
  
@@ -39780,12 +40732,8 @@
 -		SVNCONFIG="$_SVNCONFIG/bin/svn-config"
 -	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
  
++HAVE_XSLT=yes
  
 -if test -x "$SVNCONFIG"; then
 -	SVNLD="`$SVNCONFIG --ldflags`"
@@ -39794,46 +40742,28 @@
 -		SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
 -	echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+
-+
-+for ac_func in setenv
-+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 { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-else
 -	echo "$as_me:$LINENO: result: not found" >&5
 -echo "${ECHO_T}not found" >&6
 -	SVNLD=""
 -		SVN_INCLUDES="/usr/local/include /usr/include"
-+  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
  
 -# Check whether --with-svn-include or --without-svn-include was given.
 -if test "${with_svn_include+set}" = set; then
 -  withval="$with_svn_include"
-+/* 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.  */
++   { echo "$as_me:$LINENO: checking for xml2-config" >&5
++echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6; }
++   if test -n "$XML_CONFIG"; then
++        kde_cv_path="$XML_CONFIG";
++   else
++        kde_cache=`echo xml2-config | sed 'y%./+-%__p_%'`
  
 -				 if test "$withval" != "yes" -a "$withval" != ""; then
 -					 SVN_INCLUDES=$withval
 -				 fi
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
  
 -fi;
 -	echo "$as_me:$LINENO: checking for Subversion headers" >&5
@@ -39844,7 +40774,13 @@
 -			SVN_INCLUDE="-I$VALUE"
 -			break
 -		fi
--	done
++        kde_cv_path="NONE"
++	kde_save_IFS=$IFS
++	IFS=':'
++	dirs=""
++	for dir in $PATH; do
++	  dirs="$dirs $dir"
+ 	done
 -	if test $SVN_INCLUDE ; then
 -		echo "$as_me:$LINENO: result: found" >&5
 -echo "${ECHO_T}found" >&6
@@ -39852,76 +40788,35 @@
 -		echo "$as_me:$LINENO: result: not found" >&5
 -echo "${ECHO_T}not found" >&6
 -		SVN_SUBDIR=
--	fi
++	if test -z ""; then  	  dirs="${prefix}/bin ${exec_prefix}/bin $dirs"
++        else  	  dirs="$dirs ${prefix}/bin ${exec_prefix}/bin"
+ 	fi
 -	SVN_LIBS="/usr/local/lib /usr/lib /usr/lib64"
-+#undef $ac_func
++	IFS=$kde_save_IFS
  
 -# Check whether --with-svn-lib or --without-svn-lib was given.
 -if test "${with_svn_lib+set}" = set; then
 -  withval="$with_svn_lib"
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
++        for dir in $dirs; do
++	  if test -x "$dir/xml2-config"; then
++	    if test -n ""
++	    then
++              evalstr="$dir/xml2-config  2>&1 "
++	      if eval $evalstr; then
++                kde_cv_path="$dir/xml2-config"
++                break
++	      fi
++            else
++		kde_cv_path="$dir/xml2-config"
++                break
++	    fi
++          fi
++        done
  
 -			     if test "$withval" != "yes" -a "$withval" != ""; then
 -			         SVN_LIBS=$withval
 -			     fi
-+int
-+main ()
-+{
-+return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "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
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  eval "$as_ac_var=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++        eval "kde_cv_path_$kde_cache=$kde_cv_path"
  
 -fi;
 -	echo "$as_me:$LINENO: checking for Subversion libraries" >&5
@@ -39941,8 +40836,7 @@
 -echo "${ECHO_T}not found" >&6
 -		SVN_SUBDIR=
 -	fi
-+	eval "$as_ac_var=no"
- fi
+-fi
 -SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
 -SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
 -SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
@@ -39951,30 +40845,26 @@
 -  { { echo "$as_me:$LINENO: error: --with-subversion was given, but test for subversion failed" >&5
 -echo "$as_me: error: --with-subversion was given, but test for subversion failed" >&2;}
 -   { (exit 1); exit 1; }; }
-+rm -f core conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
+-fi
  fi
-+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
  
  
++      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
  
++   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; }
  
-+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: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
++echo "$as_me: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
++  HELP_SUBDIR=
  
++   else
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
++      XML_CONFIG=$kde_cv_path
  
 -if test -n "$SVN_SUBDIR"; then
 -  include_kioslave_svn_TRUE=
@@ -39982,113 +40872,59 @@
 -else
 -  include_kioslave_svn_TRUE='#'
 -  include_kioslave_svn_FALSE=
-+if test "${ac_cv_header_libxml2_libxml_xmlmemory_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for libxml2/libxml/xmlmemory.h" >&5
-+echo $ECHO_N "checking for libxml2/libxml/xmlmemory.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libxml2_libxml_xmlmemory_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--
--
--
+-fi
++   fi
+ 
+ 
++if test -n "$XML_CONFIG"; then
++  vers=`$XML_CONFIG --version 2>/dev/null | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
++  if test -n "$vers" && test "$vers" -ge 2004008
++  then
++     LIBXML_LIBS="`$XML_CONFIG --libs`"
++     LIBXML_RPATH=
++     for args in $LIBXML_LIBS; do
++	  case $args in
++	    -L*)
++  	       LIBXML_RPATH="$LIBXML_RPATH $args"
++ 	       ;;
++          esac
++     done
++     LIBXML_RPATH=`echo $LIBXML_RPATH | sed -e "s/-L/-R/g"`
++     LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
+ 
 -case "$host" in
 -   *-gnu)
 -      saved_LIBS="$LIBS"
 -      LIBS="$LIBS -Wl,-Bstatic -liberty -Wl,-Bdynamic"
 -      cat >conftest.$ac_ext <<_ACEOF
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libxml2_libxml_xmlmemory_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libxml2_libxml_xmlmemory_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking libxml2/libxml/xmlmemory.h usability" >&5
-+echo $ECHO_N "checking libxml2/libxml/xmlmemory.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 <libxml2/libxml/xmlmemory.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
  
 -int
 -main ()
 -{
-+	ac_header_compiler=no
-+fi
++   { 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_%'`
  
 -  ;
 -  return 0;
 -}
-+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?
-+{ echo "$as_me:$LINENO: checking libxml2/libxml/xmlmemory.h presence" >&5
-+echo $ECHO_N "checking libxml2/libxml/xmlmemory.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <libxml2/libxml/xmlmemory.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "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_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -40104,28 +40940,28 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  kde_compile_kmtrace=$GCC
-+  (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
-+  ac_header_preproc=yes
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
 -kde_compile_kmtrace=no
-+  ac_header_preproc=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -      KMTRACE_LIBS=$LIBS
++        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
  
 -      LIBS="$saved_LIBS"
 -      ;;
@@ -40133,54 +40969,29 @@
 -      kde_compile_kmtrace=no
 -      ;;
 -esac
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
++        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
  
 -if test ! "x$kde_compile_kmtrace" = "xyes"; then
 -   DO_NOT_COMPILE="$DO_NOT_COMPILE kmtrace"
 -fi
-+# 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: libxml2/libxml/xmlmemory.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: in the future, the compiler will take precedence" >&2;}
++        eval "kde_cv_path_$kde_cache=$kde_cv_path"
  
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for libxml2/libxml/xmlmemory.h" >&5
-+echo $ECHO_N "checking for libxml2/libxml/xmlmemory.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libxml2_libxml_xmlmemory_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_libxml2_libxml_xmlmemory_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libxml2_libxml_xmlmemory_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libxml2_libxml_xmlmemory_h" >&6; }
  
 +fi
-+if test $ac_cv_header_libxml2_libxml_xmlmemory_h = yes; then
-+  have_libxml2=yes
-+else
-+  have_libxml2=no
-+fi
  
 - ac_ext=cc
 -ac_cpp='$CXXCPP $CPPFLAGS'
@@ -40189,161 +41000,131 @@
 -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'
++      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
  
-+if test "$have_libxml2" = "no"; then
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
-+fi
++   fi
  
 -if test "${ac_cv_header_FlexLexer_h+set}" = set; then
 -  echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
 -echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6
 -if test "${ac_cv_header_FlexLexer_h+set}" = set; then
-+if test "${ac_cv_header_libxslt_xslt_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for libxslt/xslt.h" >&5
-+echo $ECHO_N "checking for libxslt/xslt.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libxslt_xslt_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
 -echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libxslt_xslt_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libxslt_xslt_h" >&6; }
- else
-   # Is the header compilable?
+-else
+-  # Is the header compilable?
 -echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
 -echo $ECHO_N "checking FlexLexer.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking libxslt/xslt.h usability" >&5
-+echo $ECHO_N "checking libxslt/xslt.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -34712,27 +37929,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
+-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 <FlexLexer.h>
-+#include <libxslt/xslt.h>
- _ACEOF
- rm -f conftest.$ac_objext
+-_ACEOF
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -34741,25 +37970,31 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++   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; }
++      XMLLINT=""
++   else
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
++      XMLLINT=$kde_cv_path
  
 -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; }
++   fi
  
- # Is the header present?
+-# Is the header present?
 -echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
 -echo $ECHO_N "checking FlexLexer.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking libxslt/xslt.h presence" >&5
-+echo $ECHO_N "checking libxslt/xslt.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.  */
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 -#include <FlexLexer.h>
-+#include <libxslt/xslt.h>
++
++cat >>confdefs.h <<_ACEOF
++#define XMLLINT "$XMLLINT"
  _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;;
-+  *) ac_try_echo=$ac_try;;
-+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
-@@ -34767,8 +38002,8 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; 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
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++
    else
-     ac_cpp_err=
+-    ac_cpp_err=
++     { echo "$as_me:$LINENO: WARNING: You need at least libxml 2.4.8" >&5
++echo "$as_me: WARNING: You need at least libxml 2.4.8" >&2;}
++     HAVE_XSLT=no
    fi
-@@ -34783,175 +38018,326 @@
+-else
+-  ac_cpp_err=yes
+ fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
+-  ac_header_preproc=no
+-fi
+-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; }
++if test "$HAVE_XSLT" = yes; then
  
- # So?  What about this header?
+-# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
+-  yes:no: )
 -    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&5
 -echo "$as_me: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the compiler's result" >&5
 -echo "$as_me: WARNING: FlexLexer.h: proceeding with the compiler's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libxslt/xslt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libxslt/xslt.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
 -    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: present but cannot be compiled" >&5
 -echo "$as_me: WARNING: FlexLexer.h: present but cannot be compiled" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&5
@@ -40364,77 +41145,33 @@
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
-+    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: libxslt/xslt.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libxslt/xslt.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: libxslt/xslt.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: libxslt/xslt.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libxslt/xslt.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: libxslt/xslt.h: in the future, the compiler will take precedence" >&2;}
-+
-     ;;
- esac
+-    ;;
+-esac
 -echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
 -echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6
 -if test "${ac_cv_header_FlexLexer_h+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for libxslt/xslt.h" >&5
-+echo $ECHO_N "checking for libxslt/xslt.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libxslt_xslt_h+set}" = set; then
++
++   { echo "$as_me:$LINENO: checking for xslt-config" >&5
++echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6; }
++   if test -n "$XSLT_CONFIG"; then
++        kde_cv_path="$XSLT_CONFIG";
++   else
++        kde_cache=`echo xslt-config | sed 'y%./+-%__p_%'`
++
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_header_FlexLexer_h=$ac_header_preproc
-+  ac_cv_header_libxslt_xslt_h=$ac_header_preproc
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
 -echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libxslt_xslt_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libxslt_xslt_h" >&6; }
  
- fi
+-fi
 -if test $ac_cv_header_FlexLexer_h = yes; then
 -  kde_have_flex=yes
-+if test $ac_cv_header_libxslt_xslt_h = yes; then
-+  have_libxslt=yes
- else
+-else
 -  kde_have_flex=no
-+  have_libxslt=no
-+fi
-+
-+
-+
-+if test "$have_libxslt" = "no"; then
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
-+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
-+
-+
-+
-+
-+
-+HAVE_XSLT=yes
-+
-+
-+   { echo "$as_me:$LINENO: checking for xml2-config" >&5
-+echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6; }
-+   if test -n "$XML_CONFIG"; then
-+        kde_cv_path="$XML_CONFIG";
-+   else
-+        kde_cache=`echo xml2-config | sed 'y%./+-%__p_%'`
-+
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
+-fi
 +        kde_cv_path="NONE"
 +	kde_save_IFS=$IFS
 +	IFS=':'
@@ -40448,163 +41185,6 @@
 +	IFS=$kde_save_IFS
 +
 +        for dir in $dirs; do
-+	  if test -x "$dir/xml2-config"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/xml2-config  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/xml2-config"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/xml2-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 "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-+
-+  { echo "$as_me:$LINENO: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
-+echo "$as_me: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
-+  HELP_SUBDIR=
-+
-+   else
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-+      XML_CONFIG=$kde_cv_path
-+
-+   fi
-+
-+
-+if test -n "$XML_CONFIG"; then
-+  vers=`$XML_CONFIG --version 2>/dev/null | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+  if test -n "$vers" && test "$vers" -ge 2004008
-+  then
-+     LIBXML_LIBS="`$XML_CONFIG --libs`"
-+     LIBXML_RPATH=
-+     for args in $LIBXML_LIBS; do
-+	  case $args in
-+	    -L*)
-+  	       LIBXML_RPATH="$LIBXML_RPATH $args"
-+ 	       ;;
-+          esac
-+     done
-+     LIBXML_RPATH=`echo $LIBXML_RPATH | sed -e "s/-L/-R/g"`
-+     LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
-+
-+
-+   { 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 { 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 "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-+      XMLLINT=""
-+   else
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-+      XMLLINT=$kde_cv_path
-+
-+   fi
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define XMLLINT "$XMLLINT"
-+_ACEOF
-+
-+  else
-+     { echo "$as_me:$LINENO: WARNING: You need at least libxml 2.4.8" >&5
-+echo "$as_me: WARNING: You need at least libxml 2.4.8" >&2;}
-+     HAVE_XSLT=no
-+  fi
- fi
- 
-+if test "$HAVE_XSLT" = yes; then
-+
-+
-+   { echo "$as_me:$LINENO: checking for xslt-config" >&5
-+echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6; }
-+   if test -n "$XSLT_CONFIG"; then
-+        kde_cv_path="$XSLT_CONFIG";
-+   else
-+        kde_cache=`echo xslt-config | sed 'y%./+-%__p_%'`
-+
-+        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/xslt-config"; then
 +	    if test -n ""
 +	    then
@@ -40619,7 +41199,7 @@
 +	    fi
 +          fi
 +        done
-+
+ 
 +        eval "kde_cv_path_$kde_cache=$kde_cv_path"
  
  
@@ -40781,7 +41361,7 @@
  
  
  
-@@ -34976,8 +38362,8 @@
+@@ -34976,8 +38037,8 @@
  fi
  
  for i in $ac_topsubdirs; do
@@ -40792,7 +41372,7 @@
    if test -d $srcdir/$i; then
      install_it="yes"
      for j in $DO_NOT_COMPILE; do
-@@ -34988,8 +38374,8 @@
+@@ -34988,8 +38049,8 @@
    else
      install_it="no"
    fi
@@ -40803,7 +41383,7 @@
    vari=`echo $i | sed -e 's,[-+.@],_,g'`
    if test $install_it = "yes"; then
      TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -35201,245 +38587,247 @@
+@@ -35201,245 +38262,247 @@
    umbrello_SUBDIR_included_FALSE=
  fi
  
@@ -41171,7 +41751,7 @@
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -35459,39 +38847,58 @@
+@@ -35459,39 +38522,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -41246,7 +41826,7 @@
    fi
  fi
  rm -f confcache
-@@ -35500,38 +38907,31 @@
+@@ -35500,38 +38582,31 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -41298,7 +41878,7 @@
  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
-@@ -35766,11 +39166,35 @@
+@@ -35766,11 +38841,35 @@
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
@@ -41336,7 +41916,7 @@
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
-@@ -35779,8 +39203,43 @@
+@@ -35779,8 +38878,43 @@
  fi
  
  
@@ -41381,7 +41961,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -35794,18 +39253,19 @@
+@@ -35794,18 +38928,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -41404,7 +41984,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -35813,159 +39273,120 @@
+@@ -35813,159 +38948,120 @@
  
  
  # Name of the executable.
@@ -41635,7 +42215,7 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -35974,7 +39395,19 @@
+@@ -35974,7 +39070,19 @@
    as_mkdir_p=false
  fi
  
@@ -41656,7 +42236,7 @@
  
  # 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'"
-@@ -35983,31 +39416,14 @@
+@@ -35983,31 +39091,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -41688,11 +42268,11 @@
 +ac_log="
  This file was extended by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.60a.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -36015,30 +39431,20 @@
+@@ -36015,30 +39106,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -41731,7 +42311,16 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -36065,19 +39471,21 @@
+@@ -36046,7 +39127,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
+@@ -36065,19 +39146,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -41743,7 +42332,7 @@
  config.status
 -configured by $0, generated by GNU Autoconf 2.59,
 -  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.60,
++configured by $0, generated by GNU Autoconf 2.60a,
 +  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
@@ -41759,7 +42348,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -36088,39 +39496,24 @@
+@@ -36088,39 +39171,24 @@
  do
    case $1 in
    --*=*)
@@ -41805,7 +42394,7 @@
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -36130,18 +39523,24 @@
+@@ -36130,18 +39198,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -41835,7 +42424,7 @@
  
    esac
    shift
-@@ -36157,156 +39556,169 @@
+@@ -36157,156 +39231,169 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -42135,7 +42724,7 @@
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -36318,553 +39730,751 @@
+@@ -36318,553 +39405,751 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -42866,8 +43455,8 @@
 +LIB_KFILE!$LIB_KFILE$ac_delim
 +LIB_KFM!$LIB_KFM$ac_delim
 +LEX!$LEX$ac_delim
++LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
 +LEXLIB!$LEXLIB$ac_delim
-+LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
 +DBIV_INCLUDES!$DBIV_INCLUDES$ac_delim
 +DBIV_LDFLAGS!$DBIV_LDFLAGS$ac_delim
 +DBIV_NAME!$DBIV_NAME$ac_delim
@@ -43379,7 +43968,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -36872,248 +40482,130 @@
+@@ -36872,248 +40157,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -43728,7 +44317,7 @@
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -37124,135 +40616,39 @@
+@@ -37124,135 +40291,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -43890,7 +44479,7 @@
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -37262,18 +40658,29 @@
+@@ -37262,18 +40333,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
@@ -43928,7 +44517,7 @@
    else
      continue
    fi
-@@ -37295,53 +40702,79 @@
+@@ -37295,53 +40377,79 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -44055,7 +44644,7 @@
  KDE_SET_PREFIX
  
  dnl generate the config header
-@@ -485,6 +487,106 @@
+@@ -485,6 +487,90 @@
  dnl #endif
  dnl ])
  
@@ -44063,22 +44652,6 @@
 +AC_LANG_SAVE
 +AC_LANG_C
 +
-+AC_CHECK_HEADER(libxml2/libxml/xmlmemory.h,
-+  [have_libxml2=yes],
-+  [have_libxml2=no])
-+
-+if test "$have_libxml2" = "no"; then
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
-+fi
-+
-+AC_CHECK_HEADER(libxslt/xslt.h,
-+  [have_libxslt=yes],
-+  [have_libxslt=no])
-+
-+if test "$have_libxslt" = "no"; then
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
-+fi
-+
 +AC_LANG_RESTORE
 +
 +
@@ -44162,7 +44735,7 @@
  KDE_CREATE_SUBDIRSLIST
  AM_CONDITIONAL(cervisia_SUBDIR_included, test "x$cervisia_SUBDIR_included" = xyes)
  AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes)
-@@ -619,6 +721,7 @@
+@@ -619,6 +705,7 @@
  AC_CONFIG_FILES([ umbrello/umbrello/codeimport/Makefile ])
  AC_CONFIG_FILES([ umbrello/umbrello/codeimport/kdevcppparser/Makefile ])
  AC_CONFIG_FILES([ umbrello/umbrello/dialogs/Makefile ])




More information about the pkg-kde-commits mailing list