rev 4425 - trunk/packages/kdewebdev/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Sat Aug 26 21:27:03 UTC 2006


Author: chrsmrtn
Date: 2006-08-26 21:26:59 +0000 (Sat, 26 Aug 2006)
New Revision: 4425

Modified:
   trunk/packages/kdewebdev/debian/patches/98_buildprep.diff
Log:
kdewebdev buildprep update.


Modified: trunk/packages/kdewebdev/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdewebdev/debian/patches/98_buildprep.diff	2006-08-26 21:25:16 UTC (rev 4424)
+++ trunk/packages/kdewebdev/debian/patches/98_buildprep.diff	2006-08-26 21:26:59 UTC (rev 4425)
@@ -3910,7 +3910,7 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.59d.
++# Generated by GNU Autoconf 2.60.
  #
 -# Copyright (C) 2003 Free Software Foundation, Inc.
 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -4192,8 +4192,8 @@
 +
 +
 +      for as_shell in $as_candidate_shells $SHELL; do
-+	 # Try only shells which exist, to save several forks.
-+	 if test -f "$as_shell" &&
++	 # Try only shells that exist, to save several forks.
++	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 +		{ ("$as_shell") 2> /dev/null <<\_ASEOF
 +# Be Bourne compatible
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -5542,7 +5542,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
 +configure
-+generated by GNU Autoconf 2.59d
++generated by GNU Autoconf 2.60
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -5561,7 +5561,7 @@
  
  It was created by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.59d.  Invocation command line was
++generated by GNU Autoconf 2.60.  Invocation command line was
  
    $ $0 $@
  
@@ -6195,7 +6195,7 @@
 -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -7297,8 +7297,9 @@
 -ac_compiler_gnu=no
 +	ac_compiler_gnu=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
@@ -7371,7 +7372,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3102,285 +3881,273 @@
+@@ -3102,285 +3881,278 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7647,15 +7648,16 @@
 -continue
 +
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_c_werror_flag=$ac_save_c_werror_flag
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
@@ -7721,6 +7723,11 @@
 +   that's true only with -std.  */
 +int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 +
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++   inside strings and character constants.  */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
 +int test (int i, double x);
 +struct s1 {int (*f) (int a);};
 +struct s2 {int (*f) (double a);};
@@ -7793,7 +7800,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
-+rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
 +  test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
 -rm -f conftest*
@@ -7828,7 +7835,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3389,8 +4156,8 @@
+@@ -3389,8 +4161,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -7839,7 +7846,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3479,8 +4246,8 @@
+@@ -3479,8 +4251,8 @@
  fi
  
  fi
@@ -7850,7 +7857,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3502,8 +4269,8 @@
+@@ -3502,8 +4274,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
@@ -7861,7 +7868,7 @@
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -3537,8 +4304,13 @@
+@@ -3537,8 +4309,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7877,7 +7884,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3563,9 +4335,10 @@
+@@ -3563,9 +4340,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -7889,7 +7896,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3575,8 +4348,13 @@
+@@ -3575,8 +4353,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -7905,7 +7912,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3603,6 +4381,7 @@
+@@ -3603,6 +4386,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -7913,7 +7920,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3620,8 +4399,8 @@
+@@ -3620,8 +4404,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -7924,7 +7931,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3644,8 +4423,13 @@
+@@ -3644,8 +4428,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7940,7 +7947,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3670,9 +4454,10 @@
+@@ -3670,9 +4459,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -7952,7 +7959,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3682,8 +4467,13 @@
+@@ -3682,8 +4472,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -7968,7 +7975,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3710,6 +4500,7 @@
+@@ -3710,6 +4505,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -7976,7 +7983,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3760,18 +4551,22 @@
+@@ -3760,18 +4556,22 @@
  
    CXXFLAGS=" $CXXFLAGS"
  
@@ -8004,7 +8011,7 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3784,36 +4579,38 @@
+@@ -3784,36 +4584,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8051,7 +8058,7 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3826,55 +4623,85 @@
+@@ -3826,55 +4628,85 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8155,7 +8162,7 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3897,24 +4724,36 @@
+@@ -3897,24 +4729,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8200,15 +8207,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3923,24 +4762,28 @@
+@@ -3923,24 +4767,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_compiler_gnu=no
 +	ac_compiler_gnu=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  
  fi
@@ -8236,7 +8244,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3956,24 +4799,36 @@
+@@ -3956,24 +4804,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8281,7 +8289,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3982,70 +4837,53 @@
+@@ -3982,70 +4842,53 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8376,7 +8384,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4054,61 +4892,91 @@
+@@ -4054,61 +4897,91 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8453,20 +8461,21 @@
  
 +
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
 -rm -f conftest*
 -if test -n "$ac_declaration"; then
 -  echo '#ifdef __cplusplus' >>confdefs.h
 -  echo $ac_declaration      >>confdefs.h
 -  echo '#endif'             >>confdefs.h
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -8489,7 +8498,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4117,8 +4985,8 @@
+@@ -4117,8 +4990,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -8500,7 +8509,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4207,8 +5075,8 @@
+@@ -4207,8 +5080,8 @@
  fi
  
  fi
@@ -8511,7 +8520,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -4226,8 +5094,8 @@
+@@ -4226,8 +5099,8 @@
  
  
  
@@ -8522,7 +8531,7 @@
  
  
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4252,24 +5120,36 @@
+@@ -4252,24 +5125,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8567,7 +8576,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4278,13 +5158,14 @@
+@@ -4278,13 +5163,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8575,17 +8584,18 @@
 +	kde_bad_compiler=yes
  
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
 -  echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
 -echo "${ECHO_T}$kde_bad_compiler" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +  { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
 +echo "${ECHO_T}$kde_bad_compiler" >&6; }
  
  if test "$kde_bad_compiler" = "yes"; then
    { { echo "$as_me:$LINENO: error:
-@@ -4326,17 +5207,16 @@
+@@ -4326,17 +5212,16 @@
          fi
        fi
  
@@ -8607,7 +8617,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'
-@@ -4364,24 +5244,36 @@
+@@ -4364,24 +5249,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8652,17 +8662,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4390,7 +5282,9 @@
+@@ -4390,8 +5287,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4404,29 +5298,28 @@
+   ac_ext=c
+@@ -4404,29 +5303,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8700,7 +8712,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'
-@@ -4453,24 +5346,36 @@
+@@ -4453,24 +5351,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8745,17 +8757,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4479,7 +5384,9 @@
+@@ -4479,8 +5389,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4493,13 +5400,13 @@
+   ac_ext=c
+@@ -4493,13 +5405,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8773,7 +8787,7 @@
   :
   WOVERLOADED_VRITUAL=""
  fi
-@@ -4520,16 +5427,15 @@
+@@ -4520,16 +5432,15 @@
  
    if test "$kde_use_profiling" = "yes"; then
  
@@ -8794,7 +8808,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'
-@@ -4556,24 +5462,36 @@
+@@ -4556,24 +5467,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8839,17 +8853,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4582,7 +5500,9 @@
+@@ -4582,8 +5505,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4596,16 +5516,16 @@
+   ac_ext=c
+@@ -4596,16 +5521,16 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8870,7 +8886,7 @@
   :
  
  fi
-@@ -4620,16 +5540,15 @@
+@@ -4620,16 +5545,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"
  
@@ -8891,7 +8907,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4656,24 +5575,36 @@
+@@ -4656,24 +5580,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8936,17 +8952,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4682,7 +5613,9 @@
+@@ -4682,8 +5618,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4696,27 +5629,26 @@
+   ac_ext=c
+@@ -4696,27 +5634,26 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8981,7 +8999,7 @@
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4741,24 +5673,36 @@
+@@ -4741,24 +5678,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9026,17 +9044,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4767,7 +5711,9 @@
+@@ -4767,8 +5716,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CFLAGS="$save_CFLAGS"
-@@ -4781,13 +5727,13 @@
+   ac_ext=c
+@@ -4781,13 +5732,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9054,7 +9074,7 @@
   :
  
  fi
-@@ -4795,16 +5741,15 @@
+@@ -4795,16 +5746,15 @@
            ;;
          esac
  
@@ -9075,7 +9095,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'
-@@ -4831,24 +5776,36 @@
+@@ -4831,24 +5781,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9120,17 +9140,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4857,7 +5814,9 @@
+@@ -4857,8 +5819,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4871,28 +5830,27 @@
+   ac_ext=c
+@@ -4871,28 +5835,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9167,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'
-@@ -4919,24 +5877,36 @@
+@@ -4919,24 +5882,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9212,17 +9234,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4945,7 +5915,9 @@
+@@ -4945,8 +5920,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4959,28 +5931,27 @@
+   ac_ext=c
+@@ -4959,28 +5936,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9259,7 +9283,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'
-@@ -5007,24 +5978,36 @@
+@@ -5007,24 +5983,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9304,17 +9328,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5033,7 +6016,9 @@
+@@ -5033,8 +6021,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5047,13 +6032,13 @@
+   ac_ext=c
+@@ -5047,13 +6037,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9332,7 +9358,7 @@
   :
  
  fi
-@@ -5065,13 +6050,13 @@
+@@ -5065,13 +6055,13 @@
      CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
    fi
  
@@ -9350,7 +9376,7 @@
  
    HAVE_GCC_VISIBILITY=0
  
-@@ -5079,16 +6064,15 @@
+@@ -5079,16 +6069,15 @@
    if test "$GXX" = "yes"; then
      gcc_no_reorder_blocks=NO
  
@@ -9371,7 +9397,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'
-@@ -5115,24 +6099,36 @@
+@@ -5115,24 +6104,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9416,17 +9442,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5141,7 +6137,9 @@
+@@ -5141,8 +6142,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5155,13 +6153,13 @@
+   ac_ext=c
+@@ -5155,13 +6158,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9444,7 +9472,7 @@
   :
  
  fi
-@@ -5173,16 +6171,15 @@
+@@ -5173,16 +6176,15 @@
            CFLAGS="$CFLAGS -fno-reorder-blocks"
      fi
  
@@ -9465,7 +9493,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'
-@@ -5209,24 +6206,36 @@
+@@ -5209,24 +6211,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9510,17 +9538,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5235,7 +6244,9 @@
+@@ -5235,8 +6249,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5249,28 +6260,27 @@
+   ac_ext=c
+@@ -5249,28 +6265,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9557,7 +9587,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'
-@@ -5297,24 +6307,36 @@
+@@ -5297,24 +6312,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9602,17 +9632,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5323,7 +6345,9 @@
+@@ -5323,8 +6350,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5337,28 +6361,27 @@
+   ac_ext=c
+@@ -5337,28 +6366,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9649,7 +9681,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'
-@@ -5385,24 +6408,36 @@
+@@ -5385,24 +6413,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9694,17 +9726,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5411,7 +6446,9 @@
+@@ -5411,8 +6451,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5425,28 +6462,27 @@
+   ac_ext=c
+@@ -5425,28 +6467,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9741,7 +9775,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'
-@@ -5473,24 +6509,36 @@
+@@ -5473,24 +6514,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9786,17 +9820,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5499,7 +6547,9 @@
+@@ -5499,8 +6552,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5513,13 +6563,13 @@
+   ac_ext=c
+@@ -5513,13 +6568,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9814,7 +9850,7 @@
   :
   USE_EXCEPTIONS=
  fi
-@@ -5527,37 +6577,37 @@
+@@ -5527,37 +6582,37 @@
      ENABLE_PERMISSIVE_FLAG="-fpermissive"
  
      if test "$kde_use_pch" = "yes"; then
@@ -9866,7 +9902,7 @@
  if test "${kde_cv_opt_noinline_match+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5589,24 +6639,36 @@
+@@ -5589,24 +6644,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9911,7 +9947,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5615,9 +6677,10 @@
+@@ -5615,18 +6682,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9919,11 +9955,12 @@
 +	kde_cv_opt_noinline_match=no
  
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -5625,8 +6688,8 @@
+     CFLAGS="$ac_cflags_save"
    fi
  
  fi
@@ -9934,7 +9971,7 @@
  
      if test "x$kde_cv_opt_noinline_match" = "xno" ; then
         CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5646,16 +6709,15 @@
+@@ -5646,16 +6714,15 @@
  
      if test "$kde_use_pch" = "yes"; then
  
@@ -9955,7 +9992,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'
-@@ -5682,24 +6744,36 @@
+@@ -5682,24 +6749,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10000,17 +10037,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5708,7 +6782,9 @@
+@@ -5708,8 +6787,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5722,29 +6798,28 @@
+   ac_ext=c
+@@ -5722,29 +6803,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10048,7 +10087,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'
-@@ -5771,24 +6846,36 @@
+@@ -5771,24 +6851,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10093,17 +10132,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5797,7 +6884,9 @@
+@@ -5797,8 +6889,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5811,28 +6900,27 @@
+   ac_ext=c
+@@ -5811,28 +6905,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10140,7 +10181,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'
-@@ -5859,24 +6947,36 @@
+@@ -5859,24 +6952,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10185,17 +10226,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5885,7 +6985,9 @@
+@@ -5885,8 +6990,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5899,28 +7001,27 @@
+   ac_ext=c
+@@ -5899,28 +7006,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10232,7 +10275,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'
-@@ -5947,24 +7048,36 @@
+@@ -5947,24 +7053,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10277,17 +10320,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5973,7 +7086,9 @@
+@@ -5973,8 +7091,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5987,28 +7102,27 @@
+   ac_ext=c
+@@ -5987,28 +7107,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10324,7 +10369,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'
-@@ -6035,24 +7149,36 @@
+@@ -6035,24 +7154,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10369,17 +10414,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6061,7 +7187,9 @@
+@@ -6061,8 +7192,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6075,28 +7203,27 @@
+   ac_ext=c
+@@ -6075,28 +7208,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10416,7 +10463,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'
-@@ -6123,24 +7250,36 @@
+@@ -6123,24 +7255,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10461,17 +10508,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6149,7 +7288,9 @@
+@@ -6149,8 +7293,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6163,13 +7304,13 @@
+   ac_ext=c
+@@ -6163,13 +7309,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10489,7 +10538,7 @@
   :
  
  fi
-@@ -6276,13 +7417,13 @@
+@@ -6276,13 +7422,13 @@
  fi
  
  
@@ -10506,7 +10555,7 @@
  if test -z "$CXXCPP"; then
    if test "${ac_cv_prog_CXXCPP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6312,8 +7453,13 @@
+@@ -6312,8 +7458,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -10522,7 +10571,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6338,9 +7484,10 @@
+@@ -6338,9 +7489,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -10534,7 +10583,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6350,8 +7497,13 @@
+@@ -6350,8 +7502,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -10550,7 +10599,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6378,6 +7530,7 @@
+@@ -6378,6 +7535,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -10558,7 +10607,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6395,8 +7548,8 @@
+@@ -6395,8 +7553,8 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -10569,7 +10618,7 @@
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
  do
-@@ -6419,8 +7572,13 @@
+@@ -6419,8 +7577,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -10585,7 +10634,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6445,9 +7603,10 @@
+@@ -6445,9 +7608,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -10597,7 +10646,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6457,8 +7616,13 @@
+@@ -6457,8 +7621,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -10613,7 +10662,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6485,6 +7649,7 @@
+@@ -6485,6 +7654,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -10621,7 +10670,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6511,16 +7676,15 @@
+@@ -6511,16 +7681,15 @@
       NOOPT_CFLAGS=-O0
    fi
  
@@ -10642,7 +10691,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'
-@@ -6547,24 +7711,36 @@
+@@ -6547,24 +7716,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10687,17 +10736,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6573,7 +7749,9 @@
+@@ -6573,8 +7754,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6587,22 +7765,21 @@
+   ac_ext=c
+@@ -6587,22 +7770,21 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10726,7 +10777,7 @@
        if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
          ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
          ac_coverage_linker="-lgcc"
-@@ -6618,36 +7795,36 @@
+@@ -6618,36 +7800,36 @@
        CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
        LDFLAGS="$LDFLAGS $ac_coverage_linker"
  
@@ -10773,7 +10824,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'
-@@ -6674,24 +7851,36 @@
+@@ -6674,24 +7856,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10818,17 +10869,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6700,7 +7889,9 @@
+@@ -6700,8 +7894,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6714,29 +7905,28 @@
+   ac_ext=c
+@@ -6714,29 +7910,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10866,7 +10919,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'
-@@ -6763,24 +7953,36 @@
+@@ -6763,24 +7958,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10911,17 +10964,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6789,7 +7991,9 @@
+@@ -6789,8 +7996,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6803,13 +8007,13 @@
+   ac_ext=c
+@@ -6803,13 +8012,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10939,7 +10994,7 @@
   :
  
  fi
-@@ -6819,13 +8023,13 @@
+@@ -6819,13 +8028,13 @@
  
  
  
@@ -10957,7 +11012,7 @@
  
    if test "x$kde_use_final" = "xyes"; then
        KDE_USE_FINAL_TRUE=""
-@@ -6838,13 +8042,13 @@
+@@ -6838,13 +8047,13 @@
  
  
  
@@ -10975,7 +11030,7 @@
  
    KDE_NO_UNDEFINED=""
    if test "x$kde_use_closure" = "xyes"; then
-@@ -6855,216 +8059,36 @@
+@@ -6855,216 +8064,36 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -10988,25 +11043,9 @@
 -kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
 -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+
-+
-+  # Check whether --enable-nmcheck was given.
-+if test "${enable_nmcheck+set}" = set; then
-+  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
- else
-+  kde_use_nmcheck=no
-+fi
+-else
  
  
-+  if test "$kde_use_nmcheck" = "yes"; then
-+      KDE_USE_NMCHECK_TRUE=""
-+      KDE_USE_NMCHECK_FALSE="#"
-+   else
-+      KDE_USE_NMCHECK_TRUE="#"
-+      KDE_USE_NMCHECK_FALSE=""
-+  fi
  
 -   ac_ext=cc
 -ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11015,6 +11054,12 @@
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
 -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++  # Check whether --enable-nmcheck was given.
++if test "${enable_nmcheck+set}" = set; then
++  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
++else
++  kde_use_nmcheck=no
++fi
  
  
 -  save_CXXFLAGS="$CXXFLAGS"
@@ -11025,7 +11070,14 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++  if test "$kde_use_nmcheck" = "yes"; then
++      KDE_USE_NMCHECK_TRUE=""
++      KDE_USE_NMCHECK_FALSE="#"
++   else
++      KDE_USE_NMCHECK_TRUE="#"
++      KDE_USE_NMCHECK_FALSE=""
++  fi
+ 
 -int
 -main ()
 -{
@@ -11196,12 +11248,12 @@
 -      KDE_USE_NMCHECK_TRUE="#"
 -      KDE_USE_NMCHECK_FALSE=""
 -  fi
--
  
  
+ 
+ 
+ 
 -
--
--
 -# Check whether --enable-shared or --disable-shared was given.
 +# Check whether --enable-shared was given.
  if test "${enable_shared+set}" = set; then
@@ -11211,7 +11263,7 @@
      case $enableval in
      yes) enable_shared=yes ;;
      no) enable_shared=no ;;
-@@ -7083,12 +8107,12 @@
+@@ -7083,12 +8112,12 @@
      esac
  else
    enable_shared=yes
@@ -11228,7 +11280,7 @@
      case $enableval in
      yes) enable_static=yes ;;
      no) enable_static=no ;;
-@@ -7107,7 +8131,8 @@
+@@ -7107,7 +8136,8 @@
      esac
  else
    enable_static=no
@@ -11238,7 +11290,7 @@
  
  
  
-@@ -7116,11 +8141,11 @@
+@@ -7116,11 +8146,11 @@
      if test -z "$kdelibsuff"; then
         kdelibsuff="no"
      fi
@@ -11254,7 +11306,7 @@
  
      if test "$kdelibsuff" = "auto"; then
  
-@@ -7141,8 +8166,8 @@
+@@ -7141,8 +8171,8 @@
         kdelibsuff=
      fi
      if test -z "$kdelibsuff"; then
@@ -11265,7 +11317,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define KDELIBSUFF ""
-@@ -7158,14 +8183,13 @@
+@@ -7158,14 +8188,13 @@
  #define KDELIBSUFF "${kdelibsuff}"
  _ACEOF
  
@@ -11284,7 +11336,7 @@
      case $enableval in
      yes) enable_fast_install=yes ;;
      no) enable_fast_install=no ;;
-@@ -7184,10 +8208,11 @@
+@@ -7184,10 +8213,11 @@
      esac
  else
    enable_fast_install=yes
@@ -11299,7 +11351,7 @@
  if test "${lt_cv_path_SED+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7211,7 +8236,7 @@
+@@ -7211,7 +8241,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
@@ -11308,7 +11360,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7240,37 +8265,184 @@
+@@ -7240,37 +8270,184 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -11384,7 +11436,10 @@
 +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
-+
+ 
+-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
 +else
 +  ac_cv_path_GREP=$GREP
 +fi
@@ -11394,11 +11449,8 @@
 +{ 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
@@ -11471,25 +11523,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
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
- 
++fi
++
 +else
 +  ac_cv_path_EGREP=$EGREP
 +fi
 +
 +
 +   fi
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
  
  
+ 
 -# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+
 +# Check whether --with-gnu-ld was given.
  if test "${with_gnu_ld+set}" = set; then
 -  withval="$with_gnu_ld"
@@ -11510,7 +11562,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -7299,11 +8471,11 @@
+@@ -7299,11 +8476,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -11526,7 +11578,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7316,7 +8488,7 @@
+@@ -7316,7 +8493,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,
@@ -11535,7 +11587,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'*)
-@@ -7336,21 +8508,21 @@
+@@ -7336,21 +8513,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -11564,7 +11616,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7360,29 +8532,38 @@
+@@ -7360,29 +8537,38 @@
    ;;
  esac
  fi
@@ -11611,7 +11663,7 @@
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7390,56 +8571,63 @@
+@@ -7390,56 +8576,63 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -11709,7 +11761,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7466,44 +8654,36 @@
+@@ -7466,44 +8659,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -11764,7 +11816,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7519,7 +8699,7 @@
+@@ -7519,7 +8704,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -11773,7 +11825,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
-@@ -7535,43 +8715,27 @@
+@@ -7535,43 +8720,27 @@
    esac
    ;;
  
@@ -11830,7 +11882,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
-@@ -7590,32 +8754,22 @@
+@@ -7590,32 +8759,22 @@
    ;;
  
  openbsd*)
@@ -11866,7 +11918,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]'
-@@ -7636,17 +8790,20 @@
+@@ -7636,17 +8795,20 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -11890,7 +11942,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
-@@ -7655,14 +8812,17 @@
+@@ -7655,14 +8817,17 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -11911,16 +11963,16 @@
  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
  # Some flags need to be propagated to the compiler or linker for good
-@@ -7689,7 +8849,7 @@
+@@ -7689,7 +8854,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 7692 "configure"' > conftest.$ac_ext
-+  echo '#line 8852 "configure"' > conftest.$ac_ext
++  echo '#line 8857 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7732,14 +8892,13 @@
+@@ -7732,14 +8897,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -11937,7 +11989,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7751,7 +8910,6 @@
+@@ -7751,7 +8915,6 @@
        esac
        ;;
      *64-bit*)
@@ -11945,7 +11997,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7776,8 +8934,8 @@
+@@ -7776,8 +8939,8 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -11956,7 +12008,7 @@
  if test "${lt_cv_cc_needs_belf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7803,24 +8961,36 @@
+@@ -7803,24 +8966,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12001,18 +12053,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7829,8 +8999,9 @@
+@@ -7829,9 +9004,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -lt_cv_cc_needs_belf=no
 +	lt_cv_cc_needs_belf=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
-@@ -7840,13 +9011,33 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7840,13 +9016,33 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -12048,7 +12102,7 @@
  
  esac
  
-@@ -7854,8 +9045,8 @@
+@@ -7854,8 +9050,8 @@
  
  
  
@@ -12059,7 +12113,7 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7879,24 +9070,36 @@
+@@ -7879,24 +9075,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12104,18 +12158,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7905,8 +9108,9 @@
+@@ -7905,9 +9113,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_header_stdc=no
 +	ac_cv_header_stdc=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
-@@ -7963,6 +9167,7 @@
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -7963,6 +9172,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -12123,7 +12179,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7982,18 +9187,27 @@
+@@ -7982,18 +9192,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -12157,7 +12213,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8006,12 +9220,14 @@
+@@ -8006,12 +9225,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -12175,7 +12231,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8034,9 +9250,9 @@
+@@ -8034,9 +9255,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12188,7 +12244,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8050,24 +9266,36 @@
+@@ -8050,24 +9271,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12233,15 +12289,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8076,12 +9304,14 @@
+@@ -8076,12 +9309,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_Header=no"
 +	eval "$as_ac_Header=no"
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -12251,7 +12308,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8096,18 +9326,19 @@
+@@ -8096,18 +9331,19 @@
  for ac_header in dlfcn.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12279,7 +12336,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8118,24 +9349,36 @@
+@@ -8118,24 +9354,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12324,17 +12381,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8144,15 +9387,16 @@
+@@ -8144,15 +9392,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -12346,7 +12404,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8161,8 +9405,13 @@
+@@ -8161,8 +9410,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -12362,7 +12420,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -8186,9 +9435,10 @@
+@@ -8186,9 +9440,10 @@
  
    ac_header_preproc=no
  fi
@@ -12375,7 +12433,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8212,25 +9462,19 @@
+@@ -8212,25 +9467,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;}
@@ -12408,7 +12466,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8242,219 +9486,538 @@
+@@ -8242,226 +9491,545 @@
  
  done
  
@@ -12692,25 +12750,23 @@
 +  else
 +    ac_cpp_err=
 +  fi
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_prog_f77_g=no
++else
 +  ac_cpp_err=yes
- fi
++fi
 +if test -z "$ac_cpp_err"; then
 +  # Broken: success on invalid input.
 +continue
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_f77_g=no
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
-+fi
-+
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -12718,7 +12774,16 @@
 +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
+-  FFLAGS=$ac_save_FFLAGS
+-elif test $ac_cv_prog_f77_g = yes; then
+-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+-    FFLAGS="-g -O2"
+-  else
+-    FFLAGS="-g"
 +
 +    done
 +    ac_cv_prog_CXXCPP=$CXXCPP
@@ -13056,7 +13121,7 @@
 +	ac_compiler_gnu=no
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 +
 +fi
@@ -13119,17 +13184,22 @@
 +	ac_cv_prog_f77_g=no
 +fi
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
-   FFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_f77_g = yes; then
-@@ -8483,13 +10046,13 @@
++if test "$ac_test_FFLAGS" = set; then
++  FFLAGS=$ac_save_FFLAGS
++elif test $ac_cv_prog_f77_g = yes; then
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-g -O2"
++  else
++    FFLAGS="-g"
+   fi
+ else
+   if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+@@ -8483,13 +10051,13 @@
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  
  # find the maximum length of command line arguments
@@ -13146,7 +13216,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8518,20 +10081,70 @@
+@@ -8518,20 +10086,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -13223,7 +13293,7 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -8542,19 +10155,19 @@
+@@ -8542,19 +10160,19 @@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -13249,7 +13319,7 @@
  if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8568,9 +10181,6 @@
+@@ -8568,9 +10186,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -13259,7 +13329,7 @@
  # Transform an extracted symbol line into a proper C declaration
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
  
-@@ -8592,14 +10202,30 @@
+@@ -8592,14 +10207,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'"
    ;;
@@ -13292,7 +13362,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8617,14 +10243,17 @@
+@@ -8617,14 +10248,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -13312,7 +13382,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8742,15 +10371,15 @@
+@@ -8742,15 +10376,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
@@ -13334,7 +13404,7 @@
  if test "${lt_cv_objdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8764,8 +10393,8 @@
+@@ -8764,8 +10398,8 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -13345,7 +13415,7 @@
  objdir=$lt_cv_objdir
  
  
-@@ -8786,7 +10415,7 @@
+@@ -8786,7 +10420,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -13354,7 +13424,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8806,7 +10435,7 @@
+@@ -8806,7 +10440,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -13363,7 +13433,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8816,8 +10445,8 @@
+@@ -8816,8 +10450,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
@@ -13374,7 +13444,7 @@
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8830,32 +10459,34 @@
+@@ -8830,32 +10464,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13416,7 +13486,7 @@
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8868,27 +10499,41 @@
+@@ -8868,27 +10504,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13465,7 +13535,7 @@
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -8896,8 +10541,8 @@
+@@ -8896,8 +10546,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
@@ -13476,7 +13546,7 @@
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8910,32 +10555,34 @@
+@@ -8910,32 +10560,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13518,7 +13588,7 @@
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8948,27 +10595,41 @@
+@@ -8948,27 +10600,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13567,7 +13637,7 @@
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -8976,8 +10637,8 @@
+@@ -8976,8 +10642,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
@@ -13578,7 +13648,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8990,32 +10651,34 @@
+@@ -8990,32 +10656,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13620,7 +13690,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9028,27 +10691,41 @@
+@@ -9028,27 +10696,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13669,7 +13739,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -9063,6 +10740,7 @@
+@@ -9063,6 +10745,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -13677,7 +13747,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -9082,21 +10760,32 @@
+@@ -9082,21 +10765,32 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -13714,7 +13784,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9116,7 +10805,7 @@
+@@ -9116,7 +10810,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -13723,7 +13793,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
-@@ -9148,17 +10837,17 @@
+@@ -9148,17 +10842,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -13747,7 +13817,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9178,7 +10867,7 @@
+@@ -9178,7 +10872,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -13756,7 +13826,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
-@@ -9210,11 +10899,11 @@
+@@ -9210,11 +10904,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -13772,7 +13842,7 @@
  fi
  
    else
-@@ -9229,21 +10918,21 @@
+@@ -9229,21 +10923,21 @@
  enable_dlopen=yes
  enable_win32_dll=no
  
@@ -13801,7 +13871,7 @@
  test -z "$pic_mode" && pic_mode=default
  
  # Use C for the default configuration in the libtool script
-@@ -9273,68 +10962,25 @@
+@@ -9273,68 +10967,25 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -13885,7 +13955,7 @@
  
  
  ## CAVEAT EMPTOR:
-@@ -9348,8 +10994,8 @@
+@@ -9348,8 +10999,8 @@
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
  
@@ -13896,7 +13966,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9363,26 +11009,28 @@
+@@ -9363,26 +11014,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 \
@@ -13905,12 +13975,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9369: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11015: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11020: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9373: \$? = $ac_status" >&5
-+   echo "$as_me:11019: \$? = $ac_status" >&5
++   echo "$as_me:11024: \$? = $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
@@ -13932,7 +14002,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"
-@@ -9396,8 +11044,8 @@
+@@ -9396,8 +11049,8 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -13943,7 +14013,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -9435,6 +11083,11 @@
+@@ -9435,6 +11088,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -13955,7 +14025,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9451,7 +11104,7 @@
+@@ -9451,7 +11109,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -13964,7 +14034,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9477,6 +11130,16 @@
+@@ -9477,6 +11135,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -13981,7 +14051,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9488,7 +11151,7 @@
+@@ -9488,7 +11156,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.
@@ -13990,7 +14060,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9511,13 +11174,20 @@
+@@ -9511,13 +11179,20 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14013,7 +14083,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9532,15 +11202,15 @@
+@@ -9532,15 +11207,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -14035,7 +14105,7 @@
        ;;
  
      sunos4*)
-@@ -9549,7 +11219,7 @@
+@@ -9549,7 +11224,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14044,7 +14114,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9562,6 +11232,17 @@
+@@ -9562,6 +11237,17 @@
        fi
        ;;
  
@@ -14062,7 +14132,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9573,16 +11254,16 @@
+@@ -9573,16 +11259,16 @@
      esac
    fi
  
@@ -14083,7 +14153,7 @@
  if test "${lt_prog_compiler_pic_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9596,26 +11277,28 @@
+@@ -9596,26 +11282,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 \
@@ -14092,12 +14162,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9602: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11283: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11288: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9606: \$? = $ac_status" >&5
-+   echo "$as_me:11287: \$? = $ac_status" >&5
++   echo "$as_me:11292: \$? = $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
@@ -14119,7 +14189,7 @@
  
  if test x"$lt_prog_compiler_pic_works" = xyes; then
      case $lt_prog_compiler_pic in
-@@ -9628,7 +11311,7 @@
+@@ -9628,7 +11316,7 @@
  fi
  
  fi
@@ -14128,7 +14198,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9638,8 +11321,50 @@
+@@ -9638,8 +11326,50 @@
      ;;
  esac
  
@@ -14181,7 +14251,7 @@
  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9650,60 +11375,58 @@
+@@ -9650,60 +11380,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -14203,12 +14273,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9669: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11387: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11392: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9673: \$? = $ac_status" >&5
-+   echo "$as_me:11391: \$? = $ac_status" >&5
++   echo "$as_me:11396: \$? = $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
@@ -14260,7 +14330,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;}
-@@ -9713,8 +11436,8 @@
+@@ -9713,8 +11441,8 @@
    need_locks=no
  fi
  
@@ -14271,7 +14341,7 @@
  
    runpath_var=
    allow_undefined_flag=
-@@ -9752,6 +11475,16 @@
+@@ -9752,6 +11480,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -14288,7 +14358,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9762,6 +11495,10 @@
+@@ -9762,6 +11500,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -14299,7 +14369,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9772,6 +11509,27 @@
+@@ -9772,6 +11514,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -14327,7 +14397,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9809,7 +11567,7 @@
+@@ -9809,7 +11572,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -14336,7 +14406,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9819,13 +11577,13 @@
+@@ -9819,13 +11582,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'
@@ -14353,7 +14423,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9834,23 +11592,70 @@
+@@ -9834,23 +11597,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -14429,7 +14499,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9864,13 +11669,40 @@
+@@ -9864,13 +11674,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14472,7 +14542,7 @@
      sunos4*)
        archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -9880,24 +11712,19 @@
+@@ -9880,24 +11717,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14504,7 +14574,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9909,7 +11736,7 @@
+@@ -9909,7 +11741,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -14513,7 +14583,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9931,9 +11758,21 @@
+@@ -9931,9 +11763,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
@@ -14537,7 +14607,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9950,7 +11789,7 @@
+@@ -9950,7 +11794,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -14546,7 +14616,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`
-@@ -9969,8 +11808,12 @@
+@@ -9969,8 +11813,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -14559,7 +14629,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9978,22 +11821,23 @@
+@@ -9978,22 +11826,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -14590,7 +14660,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10009,24 +11853,36 @@
+@@ -10009,24 +11858,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14635,14 +14705,15 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10040,19 +11896,20 @@
+@@ -10040,19 +11901,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -14660,7 +14731,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10071,24 +11928,36 @@
+@@ -10071,24 +11933,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14705,17 +14776,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10102,7 +11971,9 @@
+@@ -10102,8 +11976,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10112,13 +11983,11 @@
+ 
+@@ -10112,13 +11988,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -14732,7 +14805,7 @@
  	fi
        fi
        ;;
-@@ -10131,7 +12000,7 @@
+@@ -10131,7 +12005,7 @@
        ld_shlibs=no
        ;;
  
@@ -14741,7 +14814,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10141,13 +12010,13 @@
+@@ -10141,13 +12015,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -14758,7 +14831,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.
-@@ -10157,52 +12026,52 @@
+@@ -10157,52 +12031,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -14851,7 +14924,7 @@
      fi
        ;;
  
-@@ -10236,8 +12105,8 @@
+@@ -10236,8 +12110,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -14862,7 +14935,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10245,7 +12114,7 @@
+@@ -10245,7 +12119,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -14871,7 +14944,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
-@@ -10259,47 +12128,62 @@
+@@ -10259,47 +12133,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -14958,7 +15031,7 @@
  	  hardcode_direct=yes
  	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10313,7 +12197,7 @@
+@@ -10313,7 +12202,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -14967,7 +15040,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'
-@@ -10323,7 +12207,7 @@
+@@ -10323,7 +12212,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -14976,7 +15049,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10346,7 +12230,8 @@
+@@ -10346,7 +12235,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
@@ -14986,7 +15059,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10356,7 +12241,7 @@
+@@ -10356,7 +12246,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -14995,7 +15068,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10367,14 +12252,14 @@
+@@ -10367,14 +12257,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -15012,7 +15085,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'
-@@ -10386,13 +12271,13 @@
+@@ -10386,13 +12276,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15028,7 +15101,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10400,21 +12285,15 @@
+@@ -10400,21 +12290,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -15054,7 +15127,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'
-@@ -10423,8 +12302,18 @@
+@@ -10423,8 +12307,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15075,7 +15148,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10433,7 +12322,7 @@
+@@ -10433,7 +12327,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.
@@ -15084,7 +15157,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10481,36 +12370,45 @@
+@@ -10481,36 +12375,45 @@
        fi
        ;;
  
@@ -15151,7 +15224,7 @@
        ;;
  
      uts4*)
-@@ -10525,15 +12423,10 @@
+@@ -10525,15 +12428,10 @@
      esac
    fi
  
@@ -15169,7 +15242,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10551,8 +12444,8 @@
+@@ -10551,8 +12449,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.
@@ -15180,7 +15253,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -10566,6 +12459,7 @@
+@@ -10566,6 +12464,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -15188,7 +15261,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10588,20 +12482,20 @@
+@@ -10588,20 +12487,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -15214,7 +15287,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10611,7 +12505,20 @@
+@@ -10611,7 +12510,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15236,7 +15309,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10676,7 +12583,7 @@
+@@ -10676,7 +12588,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15245,7 +15318,7 @@
    ;;
  
  beos*)
-@@ -10685,7 +12592,7 @@
+@@ -10685,7 +12597,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -15254,7 +15327,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10701,7 +12608,7 @@
+@@ -10701,7 +12613,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -15263,7 +15336,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10713,7 +12620,8 @@
+@@ -10713,7 +12625,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -15273,7 +15346,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10743,7 +12651,7 @@
+@@ -10743,7 +12656,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15282,7 +15355,7 @@
        ;;
      esac
      ;;
-@@ -10766,7 +12674,7 @@
+@@ -10766,7 +12679,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -15291,7 +15364,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"`
-@@ -10789,20 +12697,17 @@
+@@ -10789,20 +12702,17 @@
    dynamic_linker=no
    ;;
  
@@ -15323,7 +15396,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10820,14 +12725,19 @@
+@@ -10820,14 +12730,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -15345,7 +15418,7 @@
    esac
    ;;
  
-@@ -10847,9 +12757,9 @@
+@@ -10847,9 +12762,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -15357,7 +15430,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10864,7 +12774,7 @@
+@@ -10864,7 +12779,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -15366,7 +15439,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10875,7 +12785,7 @@
+@@ -10875,7 +12790,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -15375,7 +15448,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10887,6 +12797,18 @@
+@@ -10887,6 +12802,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -15394,7 +15467,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -10930,29 +12852,26 @@
+@@ -10930,29 +12857,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -15431,7 +15504,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,
-@@ -10962,6 +12881,18 @@
+@@ -10962,6 +12886,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -15450,7 +15523,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10971,7 +12902,7 @@
+@@ -10971,7 +12907,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -15459,7 +15532,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10999,8 +12930,13 @@
+@@ -10999,8 +12935,13 @@
  
  openbsd*)
    version_type=sunos
@@ -15474,7 +15547,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
-@@ -11020,7 +12956,7 @@
+@@ -11020,7 +12961,7 @@
  
  os2*)
    libname_spec='$name'
@@ -15483,7 +15556,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11038,13 +12974,6 @@
+@@ -11038,13 +12979,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -15497,7 +15570,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11070,7 +12999,7 @@
+@@ -11070,7 +13004,7 @@
    need_version=yes
    ;;
  
@@ -15506,7 +15579,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'
-@@ -11103,6 +13032,29 @@
+@@ -11103,6 +13037,29 @@
    fi
    ;;
  
@@ -15536,7 +15609,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11114,16 +13066,21 @@
+@@ -11114,16 +13071,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -15564,7 +15637,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11143,8 +13100,8 @@
+@@ -11143,8 +13105,8 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -15575,7 +15648,7 @@
  
  if test "$hardcode_action" = relink; then
    # Fast installation is not supported
-@@ -11157,29 +13114,29 @@
+@@ -11157,29 +13119,29 @@
  
  striplib=
  old_striplib=
@@ -15615,7 +15688,7 @@
      ;;
    esac
  fi
-@@ -11211,8 +13168,8 @@
+@@ -11211,8 +13173,8 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -15626,7 +15699,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11225,40 +13182,52 @@
+@@ -11225,40 +13187,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15691,15 +15764,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11267,14 +13236,15 @@
+@@ -11267,14 +13241,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_dl_dlopen=no
 +	ac_cv_lib_dl_dlopen=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -15710,7 +15784,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -11288,8 +13258,8 @@
+@@ -11288,8 +13263,8 @@
     ;;
  
    *)
@@ -15721,7 +15795,7 @@
  if test "${ac_cv_func_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11316,53 +13286,59 @@
+@@ -11316,53 +13291,59 @@
  
  #undef shl_load
  
@@ -15800,15 +15874,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11371,18 +13347,19 @@
+@@ -11371,18 +13352,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_shl_load=no
 +	ac_cv_func_shl_load=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -15825,7 +15900,7 @@
  if test "${ac_cv_lib_dld_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11395,40 +13372,52 @@
+@@ -11395,40 +13377,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15890,15 +15965,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11437,19 +13426,20 @@
+@@ -11437,19 +13431,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_dld_shl_load=no
 +	ac_cv_lib_dld_shl_load=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -15916,7 +15992,7 @@
  if test "${ac_cv_func_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11476,53 +13466,59 @@
+@@ -11476,53 +13471,59 @@
  
  #undef dlopen
  
@@ -15995,15 +16071,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11531,18 +13527,19 @@
+@@ -11531,18 +13532,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_dlopen=no
 +	ac_cv_func_dlopen=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -16020,7 +16097,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11555,40 +13552,52 @@
+@@ -11555,40 +13557,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16085,15 +16162,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11597,19 +13606,20 @@
+@@ -11597,19 +13611,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_dl_dlopen=no
 +	ac_cv_lib_dl_dlopen=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -16111,7 +16189,7 @@
  if test "${ac_cv_lib_svld_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11622,40 +13632,52 @@
+@@ -11622,40 +13637,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16176,15 +16254,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11664,19 +13686,20 @@
+@@ -11664,19 +13691,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_svld_dlopen=no
 +	ac_cv_lib_svld_dlopen=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -16202,7 +16281,7 @@
  if test "${ac_cv_lib_dld_dld_link+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11689,40 +13712,52 @@
+@@ -11689,40 +13717,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16267,15 +16346,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11731,14 +13766,15 @@
+@@ -11731,14 +13771,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_dld_dld_link=no
 +	ac_cv_lib_dld_dld_link=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -16286,7 +16366,7 @@
  if test $ac_cv_lib_dld_dld_link = yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
  fi
-@@ -11773,13 +13809,13 @@
+@@ -11773,13 +13814,13 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -16303,16 +16383,16 @@
  if test "${lt_cv_dlopen_self+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11789,7 +13825,7 @@
+@@ -11789,7 +13830,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11792 "configure"
-+#line 13828 "configure"
++#line 13833 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11846,6 +13882,8 @@
+@@ -11846,6 +13887,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -16321,7 +16401,7 @@
  
      exit (status);
  }
-@@ -11855,12 +13893,12 @@
+@@ -11855,12 +13898,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16336,7 +16416,7 @@
      esac
    else :
      # compilation failed
-@@ -11871,13 +13909,13 @@
+@@ -11871,13 +13914,13 @@
  
  
  fi
@@ -16355,16 +16435,16 @@
  if test "${lt_cv_dlopen_self_static+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11887,7 +13925,7 @@
+@@ -11887,7 +13930,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11890 "configure"
-+#line 13928 "configure"
++#line 13933 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11944,6 +13982,8 @@
+@@ -11944,6 +13987,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -16373,7 +16453,7 @@
  
      exit (status);
  }
-@@ -11953,12 +13993,12 @@
+@@ -11953,12 +13998,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16388,7 +16468,7 @@
      esac
    else :
      # compilation failed
-@@ -11969,8 +14009,8 @@
+@@ -11969,8 +14014,8 @@
  
  
  fi
@@ -16399,7 +16479,7 @@
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
-@@ -11991,19 +14031,19 @@
+@@ -11991,19 +14036,19 @@
  fi
  
  
@@ -16427,7 +16507,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -12012,58 +14052,21 @@
+@@ -12012,58 +14057,21 @@
    fi
    ;;
  
@@ -16493,7 +16573,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12078,7 +14081,8 @@
+@@ -12078,7 +14086,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.
@@ -16503,7 +16583,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 \
-@@ -12192,11 +14196,11 @@
+@@ -12192,11 +14201,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -16517,7 +16597,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12226,6 +14230,12 @@
+@@ -12226,6 +14235,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -16530,7 +16610,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12237,6 +14247,9 @@
+@@ -12237,6 +14252,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -16540,7 +16620,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12256,7 +14269,7 @@
+@@ -12256,7 +14274,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -16549,7 +16629,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12287,7 +14300,7 @@
+@@ -12287,7 +14305,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -16558,7 +16638,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12302,7 +14315,7 @@
+@@ -12302,7 +14320,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -16567,7 +16647,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12529,7 +14542,10 @@
+@@ -12529,7 +14547,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.
@@ -16579,7 +16659,7 @@
  fi
  
  
-@@ -12542,11 +14558,11 @@
+@@ -12542,11 +14563,11 @@
  CC="$lt_save_CC"
  
  
@@ -16595,7 +16675,7 @@
  
  if test -f "$ltmain" && test -n "$tagnames"; then
    if test ! -f "${ofile}"; then
-@@ -12564,6 +14580,9 @@
+@@ -12564,6 +14585,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -16605,7 +16685,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12594,8 +14613,10 @@
+@@ -12594,8 +14618,10 @@
  
        case $tagname in
        CXX)
@@ -16618,7 +16698,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'
-@@ -12614,6 +14635,7 @@
+@@ -12614,6 +14640,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -16626,7 +16706,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12631,7 +14653,7 @@
+@@ -12631,7 +14658,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -16635,7 +16715,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12641,17 +14663,34 @@
+@@ -12641,17 +14668,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -16671,7 +16751,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12662,18 +14701,27 @@
+@@ -12662,18 +14706,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -16702,7 +16782,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12687,18 +14735,18 @@
+@@ -12687,18 +14740,18 @@
    # Set up default GNU C++ configuration
  
  
@@ -16727,7 +16807,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -12727,11 +14775,11 @@
+@@ -12727,11 +14780,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -16743,7 +16823,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12744,7 +14792,7 @@
+@@ -12744,7 +14797,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,
@@ -16752,7 +16832,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'*)
-@@ -12764,21 +14812,21 @@
+@@ -12764,21 +14817,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -16781,7 +16861,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12788,8 +14836,8 @@
+@@ -12788,8 +14841,8 @@
    ;;
  esac
  fi
@@ -16792,7 +16872,7 @@
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
-@@ -12797,8 +14845,8 @@
+@@ -12797,8 +14850,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
@@ -16803,7 +16883,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12824,7 +14872,7 @@
+@@ -12824,7 +14877,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.
@@ -16812,7 +16892,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12839,8 +14887,8 @@
+@@ -12839,8 +14892,8 @@
  fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
@@ -16823,7 +16903,7 @@
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -12855,8 +14903,23 @@
+@@ -12855,8 +14908,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -16849,7 +16929,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12873,7 +14936,7 @@
+@@ -12873,7 +14941,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -16858,7 +16938,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`
-@@ -12892,8 +14955,12 @@
+@@ -12892,8 +14960,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -16871,7 +16951,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12902,15 +14969,16 @@
+@@ -12902,15 +14974,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -16892,7 +16972,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.
-@@ -12932,24 +15000,36 @@
+@@ -12932,24 +15005,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -16937,14 +17017,15 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -12963,20 +15043,21 @@
+@@ -12963,20 +15048,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -16962,7 +17043,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12995,24 +15076,36 @@
+@@ -12995,24 +15081,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17007,17 +17088,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13026,7 +15119,9 @@
+@@ -13026,8 +15124,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13036,16 +15131,26 @@
+ 
+@@ -13036,16 +15136,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17049,7 +17132,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -13059,12 +15164,12 @@
+@@ -13059,12 +15169,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'
@@ -17064,7 +17147,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
-@@ -13073,70 +15178,81 @@
+@@ -13073,70 +15183,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -17198,7 +17281,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13147,14 +15263,14 @@
+@@ -13147,14 +15268,14 @@
  	;;
      esac
      ;;
@@ -17215,7 +17298,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13171,12 +15287,12 @@
+@@ -13171,12 +15292,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -17231,7 +17314,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13185,11 +15301,11 @@
+@@ -13185,11 +15306,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.
@@ -17245,7 +17328,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13199,33 +15315,22 @@
+@@ -13199,33 +15320,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -17286,7 +17369,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13236,17 +15341,20 @@
+@@ -13236,17 +15346,20 @@
      esac
  
      case $cc_basename in
@@ -17313,7 +17396,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13262,12 +15370,15 @@
+@@ -13262,12 +15375,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -17333,7 +17416,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13278,11 +15389,25 @@
+@@ -13278,11 +15394,25 @@
  	;;
      esac
      ;;
@@ -17361,7 +17444,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13293,9 +15418,9 @@
+@@ -13293,9 +15423,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -17373,7 +17456,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13304,16 +15429,16 @@
+@@ -13304,16 +15434,16 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -17394,7 +17477,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13331,20 +15456,44 @@
+@@ -13331,20 +15461,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -17445,7 +17528,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13372,7 +15521,7 @@
+@@ -13372,7 +15526,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -17454,7 +17537,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13382,7 +15531,7 @@
+@@ -13382,7 +15536,7 @@
  	;;
      esac
      ;;
@@ -17463,7 +17546,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=
-@@ -13393,15 +15542,31 @@
+@@ -13393,15 +15547,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::"'
      ;;
@@ -17497,7 +17580,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13411,14 +15576,14 @@
+@@ -13411,14 +15581,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -17515,7 +17598,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13436,7 +15601,7 @@
+@@ -13436,7 +15606,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17524,7 +17607,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13455,13 +15620,13 @@
+@@ -13455,13 +15625,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -17540,7 +17623,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13470,17 +15635,17 @@
+@@ -13470,17 +15640,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -17562,7 +17645,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13499,7 +15664,7 @@
+@@ -13499,7 +15669,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17571,7 +17654,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13520,27 +15685,14 @@
+@@ -13520,27 +15690,14 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -17601,7 +17684,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13553,36 +15705,33 @@
+@@ -13553,36 +15710,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -17650,7 +17733,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13590,9 +15739,9 @@
+@@ -13590,9 +15744,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -17662,7 +17745,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13602,9 +15751,9 @@
+@@ -13602,9 +15756,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
@@ -17674,7 +17757,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13613,9 +15762,9 @@
+@@ -13613,9 +15767,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -17686,7 +17769,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13628,12 +15777,63 @@
+@@ -13628,12 +15782,63 @@
  	;;
      esac
      ;;
@@ -17752,7 +17835,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13653,8 +15853,8 @@
+@@ -13653,8 +15858,8 @@
      ld_shlibs_CXX=no
      ;;
  esac
@@ -17763,7 +17846,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  GCC_CXX="$GXX"
-@@ -13690,7 +15890,7 @@
+@@ -13690,7 +15895,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.
@@ -17772,7 +17855,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13730,7 +15930,7 @@
+@@ -13730,7 +15935,7 @@
         fi
         ;;
  
@@ -17781,7 +17864,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13766,6 +15966,29 @@
+@@ -13766,6 +15971,29 @@
  
  $rm -f confest.$objext
  
@@ -17811,7 +17894,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13774,8 +15997,8 @@
+@@ -13774,8 +16002,8 @@
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -17822,7 +17905,7 @@
  
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -13813,6 +16036,10 @@
+@@ -13813,6 +16041,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -17833,7 +17916,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13821,7 +16048,7 @@
+@@ -13821,7 +16053,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -17842,7 +17925,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13846,18 +16073,28 @@
+@@ -13846,18 +16078,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -17874,7 +17957,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13865,22 +16102,22 @@
+@@ -13865,22 +16107,22 @@
  	    ;;
  	esac
  	;;
@@ -17903,7 +17986,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13893,9 +16130,13 @@
+@@ -13893,9 +16135,13 @@
  	    ;;
  	esac
  	;;
@@ -17918,7 +18001,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13904,20 +16145,26 @@
+@@ -13904,20 +16150,26 @@
  	    ;;
  	esac
  	;;
@@ -17949,7 +18032,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13934,25 +16181,25 @@
+@@ -13934,25 +16186,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -17980,7 +18063,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13966,24 +16213,15 @@
+@@ -13966,24 +16218,15 @@
  	;;
        psos*)
  	;;
@@ -18007,7 +18090,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -13993,12 +16231,12 @@
+@@ -13993,12 +16236,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -18022,7 +18105,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -14008,7 +16246,7 @@
+@@ -14008,7 +16251,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -18031,7 +18114,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -14016,7 +16254,14 @@
+@@ -14016,7 +16259,14 @@
  	    ;;
  	esac
  	;;
@@ -18047,7 +18130,7 @@
  	;;
        vxworks*)
  	;;
-@@ -14026,16 +16271,16 @@
+@@ -14026,16 +16276,16 @@
      esac
    fi
  
@@ -18068,7 +18151,7 @@
  if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14049,26 +16294,28 @@
+@@ -14049,26 +16299,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 \
@@ -18077,12 +18160,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14055: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16300: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16305: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:14059: \$? = $ac_status" >&5
-+   echo "$as_me:16304: \$? = $ac_status" >&5
++   echo "$as_me:16309: \$? = $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
@@ -18104,7 +18187,7 @@
  
  if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
      case $lt_prog_compiler_pic_CXX in
-@@ -14081,7 +16328,7 @@
+@@ -14081,7 +16333,7 @@
  fi
  
  fi
@@ -18113,7 +18196,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -14091,8 +16338,50 @@
+@@ -14091,8 +16343,50 @@
      ;;
  esac
  
@@ -18166,7 +18249,7 @@
  if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14103,60 +16392,58 @@
+@@ -14103,60 +16397,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -18188,12 +18271,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14122: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16404: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16409: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:14126: \$? = $ac_status" >&5
-+   echo "$as_me:16408: \$? = $ac_status" >&5
++   echo "$as_me:16413: \$? = $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
@@ -18245,7 +18328,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;}
-@@ -14166,8 +16453,8 @@
+@@ -14166,8 +16458,8 @@
    need_locks=no
  fi
  
@@ -18256,7 +18339,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -14184,22 +16471,20 @@
+@@ -14184,22 +16476,20 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -18285,7 +18368,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14217,8 +16502,8 @@
+@@ -14217,8 +16507,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.
@@ -18296,7 +18379,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -14232,6 +16517,7 @@
+@@ -14232,6 +16522,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -18304,7 +18387,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14254,20 +16540,20 @@
+@@ -14254,20 +16545,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -18330,7 +18413,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14277,7 +16563,20 @@
+@@ -14277,7 +16568,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18352,7 +18435,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14342,7 +16641,7 @@
+@@ -14342,7 +16646,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18361,7 +18444,7 @@
    ;;
  
  beos*)
-@@ -14351,7 +16650,7 @@
+@@ -14351,7 +16655,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -18370,7 +18453,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14367,7 +16666,7 @@
+@@ -14367,7 +16671,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -18379,7 +18462,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14379,7 +16678,8 @@
+@@ -14379,7 +16683,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -18389,7 +18472,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14409,7 +16709,7 @@
+@@ -14409,7 +16714,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18398,7 +18481,7 @@
        ;;
      esac
      ;;
-@@ -14432,7 +16732,7 @@
+@@ -14432,7 +16737,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -18407,7 +18490,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"`
-@@ -14455,20 +16755,17 @@
+@@ -14455,20 +16760,17 @@
    dynamic_linker=no
    ;;
  
@@ -18439,7 +18522,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14486,14 +16783,19 @@
+@@ -14486,14 +16788,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -18461,7 +18544,7 @@
    esac
    ;;
  
-@@ -14513,9 +16815,9 @@
+@@ -14513,9 +16820,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -18473,7 +18556,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14530,7 +16832,7 @@
+@@ -14530,7 +16837,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -18482,7 +18565,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14541,7 +16843,7 @@
+@@ -14541,7 +16848,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -18491,7 +18574,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14553,6 +16855,18 @@
+@@ -14553,6 +16860,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -18510,7 +18593,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -14596,29 +16910,26 @@
+@@ -14596,29 +16915,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -18547,14 +18630,22 @@
    # 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,
-@@ -14628,6 +16939,18 @@
+@@ -14628,16 +16944,28 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
+-netbsd*)
+-  version_type=sunos
 +netbsdelf*-gnu)
 +  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
+   need_lib_prefix=no
+   need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -18563,19 +18654,20 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -14637,7 +16960,7 @@
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14665,8 +16988,13 @@
+@@ -14665,8 +16993,13 @@
  
  openbsd*)
    version_type=sunos
@@ -18590,7 +18682,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
-@@ -14686,7 +17014,7 @@
+@@ -14686,7 +17019,7 @@
  
  os2*)
    libname_spec='$name'
@@ -18599,7 +18691,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14704,13 +17032,6 @@
+@@ -14704,13 +17037,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -18613,7 +18705,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14736,7 +17057,7 @@
+@@ -14736,7 +17062,7 @@
    need_version=yes
    ;;
  
@@ -18622,7 +18714,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'
-@@ -14769,6 +17090,29 @@
+@@ -14769,6 +17095,29 @@
    fi
    ;;
  
@@ -18652,7 +18744,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14780,16 +17124,21 @@
+@@ -14780,16 +17129,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -18680,7 +18772,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14809,8 +17158,8 @@
+@@ -14809,8 +17163,8 @@
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -18691,7 +18783,7 @@
  
  if test "$hardcode_action_CXX" = relink; then
    # Fast installation is not supported
-@@ -14821,998 +17170,173 @@
+@@ -14821,998 +17175,173 @@
    enable_fast_install=needless
  fi
  
@@ -19829,7 +19921,7 @@
  
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
-@@ -15831,7 +17355,7 @@
+@@ -15831,7 +17360,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -19838,7 +19930,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -15846,7 +17370,7 @@
+@@ -15846,7 +17375,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
  
@@ -19847,7 +19939,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -16048,7 +17572,10 @@
+@@ -16048,7 +17577,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.
@@ -19859,7 +19951,7 @@
  fi
  
  
-@@ -16120,29 +17647,55 @@
+@@ -16120,29 +17652,55 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -19899,19 +19991,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
@@ -19923,18 +20015,17 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16150,21 +17703,21 @@
+@@ -16150,21 +17708,21 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
 -aix4*)
 -  test "$enable_shared" = yes && enable_static=no
--  ;;
 +aix4* | aix5*)
 +  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 +    test "$enable_shared" = yes && enable_static=no
 +  fi
-+  ;;
+   ;;
  esac
 -echo "$as_me:$LINENO: result: $enable_shared" >&5
 -echo "${ECHO_T}$enable_shared" >&6
@@ -19956,7 +20047,7 @@
  
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -16173,8 +17726,8 @@
+@@ -16173,8 +17731,8 @@
  lt_prog_compiler_pic_F77=
  lt_prog_compiler_static_F77=
  
@@ -19967,7 +20058,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_F77='-Wl,'
-@@ -16212,6 +17765,11 @@
+@@ -16212,6 +17770,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -19979,7 +20070,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16228,7 +17786,7 @@
+@@ -16228,7 +17791,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -19988,7 +20079,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16254,6 +17812,16 @@
+@@ -16254,6 +17817,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -20005,7 +20096,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16265,7 +17833,7 @@
+@@ -16265,7 +17838,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.
@@ -20014,7 +20105,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16288,13 +17856,20 @@
+@@ -16288,13 +17861,20 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -20037,7 +20128,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16309,15 +17884,15 @@
+@@ -16309,15 +17889,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -20059,7 +20150,7 @@
        ;;
  
      sunos4*)
-@@ -16326,7 +17901,7 @@
+@@ -16326,7 +17906,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -20068,7 +20159,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16339,6 +17914,17 @@
+@@ -16339,6 +17919,17 @@
        fi
        ;;
  
@@ -20086,7 +20177,7 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16350,16 +17936,16 @@
+@@ -16350,16 +17941,16 @@
      esac
    fi
  
@@ -20107,7 +20198,7 @@
  if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16373,26 +17959,28 @@
+@@ -16373,26 +17964,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 \
@@ -20116,12 +20207,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16379: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17965: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17970: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16383: \$? = $ac_status" >&5
-+   echo "$as_me:17969: \$? = $ac_status" >&5
++   echo "$as_me:17974: \$? = $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
@@ -20143,7 +20234,7 @@
  
  if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
      case $lt_prog_compiler_pic_F77 in
-@@ -16405,7 +17993,7 @@
+@@ -16405,7 +17998,7 @@
  fi
  
  fi
@@ -20152,7 +20243,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16415,8 +18003,50 @@
+@@ -16415,8 +18008,50 @@
      ;;
  esac
  
@@ -20205,7 +20296,7 @@
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16427,60 +18057,58 @@
+@@ -16427,60 +18062,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -20227,12 +20318,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16446: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18069: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18074: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:16450: \$? = $ac_status" >&5
-+   echo "$as_me:18073: \$? = $ac_status" >&5
++   echo "$as_me:18078: \$? = $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
@@ -20284,7 +20375,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;}
-@@ -16490,8 +18118,8 @@
+@@ -16490,8 +18123,8 @@
    need_locks=no
  fi
  
@@ -20295,7 +20386,7 @@
  
    runpath_var=
    allow_undefined_flag_F77=
-@@ -16529,6 +18157,16 @@
+@@ -16529,6 +18162,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -20312,7 +20403,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16539,6 +18177,10 @@
+@@ -16539,6 +18182,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -20323,7 +20414,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16549,6 +18191,27 @@
+@@ -16549,6 +18196,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -20351,7 +20442,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16586,7 +18249,7 @@
+@@ -16586,7 +18254,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -20360,7 +20451,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16596,13 +18259,13 @@
+@@ -16596,13 +18264,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'
@@ -20377,7 +20468,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
-@@ -16611,23 +18274,70 @@
+@@ -16611,23 +18279,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -20454,7 +20545,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16641,13 +18351,40 @@
+@@ -16641,13 +18356,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20497,7 +20588,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16657,24 +18394,19 @@
+@@ -16657,24 +18399,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20529,7 +20620,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16686,7 +18418,7 @@
+@@ -16686,7 +18423,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -20538,7 +20629,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16708,9 +18440,21 @@
+@@ -16708,9 +18445,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
@@ -20562,7 +20653,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16727,7 +18471,7 @@
+@@ -16727,7 +18476,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -20571,7 +20662,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`
-@@ -16746,8 +18490,12 @@
+@@ -16746,8 +18495,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -20584,7 +20675,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16755,45 +18503,58 @@
+@@ -16755,45 +18508,58 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -20658,14 +20749,15 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16807,19 +18568,20 @@
+@@ -16807,19 +18573,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -20683,7 +20775,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16828,24 +18590,36 @@
+@@ -16828,24 +18595,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -20728,17 +20820,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16859,7 +18633,9 @@
+@@ -16859,8 +18638,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16869,13 +18645,11 @@
+ 
+@@ -16869,13 +18650,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -20755,7 +20849,7 @@
  	fi
        fi
        ;;
-@@ -16888,7 +18662,7 @@
+@@ -16888,7 +18667,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -20764,7 +20858,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16898,68 +18672,68 @@
+@@ -16898,68 +18677,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -20877,7 +20971,7 @@
      fi
        ;;
  
-@@ -16993,8 +18767,8 @@
+@@ -16993,8 +18772,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -20888,7 +20982,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -17002,7 +18776,7 @@
+@@ -17002,7 +18781,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -20897,7 +20991,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
-@@ -17016,47 +18790,62 @@
+@@ -17016,47 +18795,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -20984,7 +21078,7 @@
  	  hardcode_direct_F77=yes
  	  export_dynamic_flag_spec_F77='${wl}-E'
  
-@@ -17070,7 +18859,7 @@
+@@ -17070,7 +18864,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -20993,7 +21087,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'
-@@ -17080,7 +18869,7 @@
+@@ -17080,7 +18874,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -21002,7 +21096,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
-@@ -17103,7 +18892,8 @@
+@@ -17103,7 +18897,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
@@ -21012,7 +21106,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17113,7 +18903,7 @@
+@@ -17113,7 +18908,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -21021,7 +21115,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17124,14 +18914,14 @@
+@@ -17124,14 +18919,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -21038,7 +21132,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'
-@@ -17143,13 +18933,13 @@
+@@ -17143,13 +18938,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21054,7 +21148,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17157,21 +18947,15 @@
+@@ -17157,21 +18952,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -21080,7 +21174,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'
-@@ -17180,8 +18964,18 @@
+@@ -17180,8 +18969,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21101,7 +21195,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17190,7 +18984,7 @@
+@@ -17190,7 +18989,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.
@@ -21110,7 +21204,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17238,36 +19032,45 @@
+@@ -17238,36 +19037,45 @@
        fi
        ;;
  
@@ -21177,7 +21271,7 @@
        ;;
  
      uts4*)
-@@ -17282,15 +19085,10 @@
+@@ -17282,15 +19090,10 @@
      esac
    fi
  
@@ -21195,7 +21289,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17308,8 +19106,8 @@
+@@ -17308,8 +19111,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.
@@ -21206,7 +21300,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -17323,6 +19121,7 @@
+@@ -17323,6 +19126,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -21214,7 +21308,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17345,20 +19144,20 @@
+@@ -17345,20 +19149,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -21240,7 +21334,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17368,7 +19167,20 @@
+@@ -17368,7 +19172,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21262,7 +21356,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17433,7 +19245,7 @@
+@@ -17433,7 +19250,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21271,7 +21365,7 @@
    ;;
  
  beos*)
-@@ -17442,7 +19254,7 @@
+@@ -17442,7 +19259,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -21280,7 +21374,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17458,7 +19270,7 @@
+@@ -17458,7 +19275,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -21289,7 +21383,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17470,7 +19282,8 @@
+@@ -17470,7 +19287,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -21299,7 +21393,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17500,7 +19313,7 @@
+@@ -17500,7 +19318,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21308,7 +21402,7 @@
        ;;
      esac
      ;;
-@@ -17523,7 +19336,7 @@
+@@ -17523,7 +19341,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -21317,7 +21411,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"`
-@@ -17546,20 +19359,17 @@
+@@ -17546,20 +19364,17 @@
    dynamic_linker=no
    ;;
  
@@ -21349,7 +21443,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17577,14 +19387,19 @@
+@@ -17577,14 +19392,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -21371,7 +21465,7 @@
    esac
    ;;
  
-@@ -17604,9 +19419,9 @@
+@@ -17604,9 +19424,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -21383,7 +21477,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17621,7 +19436,7 @@
+@@ -17621,7 +19441,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -21392,7 +21486,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17632,7 +19447,7 @@
+@@ -17632,7 +19452,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -21401,7 +21495,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17644,6 +19459,18 @@
+@@ -17644,6 +19464,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -21420,7 +21514,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17687,29 +19514,26 @@
+@@ -17687,29 +19519,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -21457,7 +21551,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,
-@@ -17719,6 +19543,18 @@
+@@ -17719,6 +19548,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -21476,7 +21570,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17728,7 +19564,7 @@
+@@ -17728,7 +19569,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -21485,7 +21579,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17756,8 +19592,13 @@
+@@ -17756,8 +19597,13 @@
  
  openbsd*)
    version_type=sunos
@@ -21500,7 +21594,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
-@@ -17777,7 +19618,7 @@
+@@ -17777,7 +19623,7 @@
  
  os2*)
    libname_spec='$name'
@@ -21509,7 +21603,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17795,13 +19636,6 @@
+@@ -17795,13 +19641,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -21523,7 +21617,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17827,7 +19661,7 @@
+@@ -17827,7 +19666,7 @@
    need_version=yes
    ;;
  
@@ -21532,7 +21626,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'
-@@ -17860,6 +19694,29 @@
+@@ -17860,6 +19699,29 @@
    fi
    ;;
  
@@ -21562,7 +21656,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17871,16 +19728,21 @@
+@@ -17871,16 +19733,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -21590,7 +21684,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17900,8 +19762,8 @@
+@@ -17900,8 +19767,8 @@
    # directories.
    hardcode_action_F77=unsupported
  fi
@@ -21601,7 +21695,7 @@
  
  if test "$hardcode_action_F77" = relink; then
    # Fast installation is not supported
-@@ -17912,36 +19774,6 @@
+@@ -17912,36 +19779,6 @@
    enable_fast_install=needless
  fi
  
@@ -21638,7 +21732,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17956,7 +19788,8 @@
+@@ -17956,7 +19793,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.
@@ -21648,7 +21742,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 \
-@@ -18056,6 +19889,12 @@
+@@ -18056,6 +19894,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -21661,7 +21755,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -18067,6 +19906,9 @@
+@@ -18067,6 +19911,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -21671,7 +21765,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -18086,7 +19928,7 @@
+@@ -18086,7 +19933,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -21680,7 +21774,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18117,7 +19959,7 @@
+@@ -18117,7 +19964,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -21689,7 +21783,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18132,7 +19974,7 @@
+@@ -18132,7 +19979,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -21698,7 +21792,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18334,7 +20176,10 @@
+@@ -18334,7 +20181,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.
@@ -21710,7 +21804,7 @@
  fi
  
  
-@@ -18355,7 +20200,6 @@
+@@ -18355,7 +20205,6 @@
  	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
  
@@ -21718,7 +21812,7 @@
  # Source file extension for Java test sources.
  ac_ext=java
  
-@@ -18367,26 +20211,55 @@
+@@ -18367,26 +20216,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -21775,7 +21869,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
-@@ -18398,8 +20271,8 @@
+@@ -18398,8 +20276,8 @@
    lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
  
@@ -21786,7 +21880,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18413,26 +20286,28 @@
+@@ -18413,26 +20291,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 \
@@ -21795,12 +21889,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18419: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20292: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20297: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18423: \$? = $ac_status" >&5
-+   echo "$as_me:20296: \$? = $ac_status" >&5
++   echo "$as_me:20301: \$? = $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
@@ -21822,7 +21916,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"
-@@ -18446,8 +20321,8 @@
+@@ -18446,8 +20326,8 @@
  lt_prog_compiler_pic_GCJ=
  lt_prog_compiler_static_GCJ=
  
@@ -21833,7 +21927,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18485,6 +20360,11 @@
+@@ -18485,6 +20365,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -21845,7 +21939,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18501,7 +20381,7 @@
+@@ -18501,7 +20386,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -21854,7 +21948,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18527,6 +20407,16 @@
+@@ -18527,6 +20412,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -21871,7 +21965,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18538,7 +20428,7 @@
+@@ -18538,7 +20433,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.
@@ -21880,7 +21974,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18561,13 +20451,20 @@
+@@ -18561,13 +20456,20 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -21903,7 +21997,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18582,15 +20479,15 @@
+@@ -18582,15 +20484,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -21925,7 +22019,7 @@
        ;;
  
      sunos4*)
-@@ -18599,7 +20496,7 @@
+@@ -18599,7 +20501,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -21934,7 +22028,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18612,6 +20509,17 @@
+@@ -18612,6 +20514,17 @@
        fi
        ;;
  
@@ -21952,7 +22046,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18623,16 +20531,16 @@
+@@ -18623,16 +20536,16 @@
      esac
    fi
  
@@ -21973,7 +22067,7 @@
  if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18646,26 +20554,28 @@
+@@ -18646,26 +20559,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 \
@@ -21982,12 +22076,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18652: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20560: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20565: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18656: \$? = $ac_status" >&5
-+   echo "$as_me:20564: \$? = $ac_status" >&5
++   echo "$as_me:20569: \$? = $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
@@ -22009,7 +22103,7 @@
  
  if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
      case $lt_prog_compiler_pic_GCJ in
-@@ -18678,7 +20588,7 @@
+@@ -18678,7 +20593,7 @@
  fi
  
  fi
@@ -22018,7 +22112,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18688,8 +20598,50 @@
+@@ -18688,8 +20603,50 @@
      ;;
  esac
  
@@ -22071,7 +22165,7 @@
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18700,60 +20652,58 @@
+@@ -18700,60 +20657,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -22093,12 +22187,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18719: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20664: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20669: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:18723: \$? = $ac_status" >&5
-+   echo "$as_me:20668: \$? = $ac_status" >&5
++   echo "$as_me:20673: \$? = $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
@@ -22150,7 +22244,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;}
-@@ -18763,8 +20713,8 @@
+@@ -18763,8 +20718,8 @@
    need_locks=no
  fi
  
@@ -22161,7 +22255,7 @@
  
    runpath_var=
    allow_undefined_flag_GCJ=
-@@ -18802,6 +20752,16 @@
+@@ -18802,6 +20757,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -22178,7 +22272,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18812,6 +20772,10 @@
+@@ -18812,6 +20777,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -22189,7 +22283,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18822,6 +20786,27 @@
+@@ -18822,6 +20791,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -22217,7 +22311,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18859,7 +20844,7 @@
+@@ -18859,7 +20849,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -22226,7 +22320,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18869,13 +20854,13 @@
+@@ -18869,13 +20859,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'
@@ -22243,7 +22337,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
-@@ -18884,23 +20869,70 @@
+@@ -18884,23 +20874,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -22320,7 +22414,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18914,13 +20946,40 @@
+@@ -18914,13 +20951,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22363,7 +22457,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18930,24 +20989,19 @@
+@@ -18930,24 +20994,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22395,7 +22489,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18959,7 +21013,7 @@
+@@ -18959,7 +21018,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -22404,7 +22498,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -18981,9 +21035,21 @@
+@@ -18981,9 +21040,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
@@ -22428,7 +22522,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -19000,7 +21066,7 @@
+@@ -19000,7 +21071,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -22437,7 +22531,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`
-@@ -19019,8 +21085,12 @@
+@@ -19019,8 +21090,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -22450,7 +22544,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -19028,22 +21098,23 @@
+@@ -19028,22 +21103,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -22481,7 +22575,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19059,24 +21130,36 @@
+@@ -19059,24 +21135,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -22526,14 +22620,15 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19090,19 +21173,20 @@
+@@ -19090,19 +21178,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -22551,7 +22646,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19121,24 +21205,36 @@
+@@ -19121,24 +21210,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -22596,17 +22691,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19152,7 +21248,9 @@
+@@ -19152,8 +21253,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19162,13 +21260,11 @@
+ 
+@@ -19162,13 +21265,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -22623,7 +22720,7 @@
  	fi
        fi
        ;;
-@@ -19181,7 +21277,7 @@
+@@ -19181,7 +21282,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -22632,7 +22729,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19191,68 +21287,68 @@
+@@ -19191,68 +21292,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -22745,7 +22842,7 @@
      fi
        ;;
  
-@@ -19286,8 +21382,8 @@
+@@ -19286,8 +21387,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -22756,7 +22853,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19295,7 +21391,7 @@
+@@ -19295,7 +21396,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -22765,7 +22862,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
-@@ -19309,47 +21405,62 @@
+@@ -19309,47 +21410,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -22834,25 +22931,25 @@
 +	hppa*64*|ia64*)
  	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
 -	  hardcode_libdir_separator_GCJ=:
+ 	  hardcode_direct_GCJ=no
+ 	  hardcode_shlibpath_var_GCJ=no
+ 	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -	  hardcode_direct_GCJ=no
 -	  hardcode_shlibpath_var_GCJ=no
--	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
- 	  hardcode_direct_GCJ=no
- 	  hardcode_shlibpath_var_GCJ=no
 -
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
 -	  hardcode_minus_L_GCJ=yes
- 	  ;;
+-	  ;;
  	*)
 -	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 -	  hardcode_libdir_separator_GCJ=:
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19363,7 +21474,7 @@
+@@ -19363,7 +21479,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -22861,7 +22958,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'
-@@ -19373,7 +21484,7 @@
+@@ -19373,7 +21489,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -22870,7 +22967,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
-@@ -19396,7 +21507,8 @@
+@@ -19396,7 +21512,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
@@ -22880,7 +22977,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19406,7 +21518,7 @@
+@@ -19406,7 +21523,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -22889,7 +22986,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19417,14 +21529,14 @@
+@@ -19417,14 +21534,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -22906,7 +23003,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'
-@@ -19436,13 +21548,13 @@
+@@ -19436,13 +21553,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -22922,7 +23019,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19450,21 +21562,15 @@
+@@ -19450,21 +21567,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -22948,7 +23045,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'
-@@ -19473,8 +21579,18 @@
+@@ -19473,8 +21584,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -22969,7 +23066,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19483,7 +21599,7 @@
+@@ -19483,7 +21604,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.
@@ -22978,7 +23075,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19531,36 +21647,45 @@
+@@ -19531,36 +21652,45 @@
        fi
        ;;
  
@@ -23045,7 +23142,7 @@
        ;;
  
      uts4*)
-@@ -19575,15 +21700,10 @@
+@@ -19575,15 +21705,10 @@
      esac
    fi
  
@@ -23063,7 +23160,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -19601,8 +21721,8 @@
+@@ -19601,8 +21726,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.
@@ -23074,7 +23171,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -19616,6 +21736,7 @@
+@@ -19616,6 +21741,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_GCJ
@@ -23082,7 +23179,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -19638,20 +21759,20 @@
+@@ -19638,20 +21764,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -23108,7 +23205,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19661,7 +21782,20 @@
+@@ -19661,7 +21787,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23130,7 +23227,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19726,7 +21860,7 @@
+@@ -19726,7 +21865,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23139,7 +23236,7 @@
    ;;
  
  beos*)
-@@ -19735,7 +21869,7 @@
+@@ -19735,7 +21874,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -23148,7 +23245,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19751,7 +21885,7 @@
+@@ -19751,7 +21890,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -23157,7 +23254,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19763,7 +21897,8 @@
+@@ -19763,7 +21902,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -23167,7 +23264,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19793,7 +21928,7 @@
+@@ -19793,7 +21933,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23176,7 +23273,7 @@
        ;;
      esac
      ;;
-@@ -19816,7 +21951,7 @@
+@@ -19816,7 +21956,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -23185,7 +23282,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"`
-@@ -19839,20 +21974,17 @@
+@@ -19839,20 +21979,17 @@
    dynamic_linker=no
    ;;
  
@@ -23217,7 +23314,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19870,1174 +22002,391 @@
+@@ -19870,1174 +22007,391 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -23602,8 +23699,11 @@
 -    lt_cv_dlopen="load_add_on"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
--    ;;
--
++    hardcode_into_libs=yes
+     ;;
++  esac
++  ;;
+ 
 -  mingw* | pw32*)
 -    lt_cv_dlopen="LoadLibrary"
 -    lt_cv_dlopen_libs=
@@ -24150,11 +24250,7 @@
 -
 -
 -fi
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
- 
+-
 +gnu*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -24710,9 +24806,7 @@
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 -    fi
-+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
- 
+-
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
@@ -24723,7 +24817,9 @@
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
--
++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+ 
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 -  *) enable_dlopen_self_static=unknown ;;
@@ -24738,7 +24834,7 @@
  fi
  
  
-@@ -21054,7 +22403,8 @@
+@@ -21054,7 +22408,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.
@@ -24748,7 +24844,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 \
-@@ -21154,6 +22504,12 @@
+@@ -21154,6 +22509,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -24761,7 +24857,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21165,6 +22521,9 @@
+@@ -21165,6 +22526,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -24771,7 +24867,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21184,7 +22543,7 @@
+@@ -21184,7 +22548,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -24780,7 +24876,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21215,7 +22574,7 @@
+@@ -21215,7 +22579,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -24789,7 +24885,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21230,7 +22589,7 @@
+@@ -21230,7 +22594,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -24798,7 +24894,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21432,7 +22791,10 @@
+@@ -21432,7 +22796,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.
@@ -24810,7 +24906,7 @@
  fi
  
  
-@@ -21452,7 +22814,6 @@
+@@ -21452,7 +22819,6 @@
        RC)
  
  
@@ -24818,7 +24914,7 @@
  # Source file extension for RC test sources.
  ac_ext=rc
  
-@@ -21471,15 +22832,42 @@
+@@ -21471,15 +22837,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -24861,7 +24957,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21495,7 +22883,8 @@
+@@ -21495,7 +22888,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.
@@ -24871,7 +24967,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 \
-@@ -21595,6 +22984,12 @@
+@@ -21595,6 +22989,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -24884,7 +24980,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21606,6 +23001,9 @@
+@@ -21606,6 +23006,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -24894,7 +24990,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21625,7 +23023,7 @@
+@@ -21625,7 +23028,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -24903,7 +24999,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21656,7 +23054,7 @@
+@@ -21656,7 +23059,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -24912,7 +25008,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21671,7 +23069,7 @@
+@@ -21671,7 +23074,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -24921,7 +25017,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21873,7 +23271,10 @@
+@@ -21873,7 +23276,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.
@@ -24933,7 +25029,7 @@
  fi
  
  
-@@ -21920,7 +23321,7 @@
+@@ -21920,7 +23326,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -24942,7 +25038,7 @@
  
  # Prevent multiple expansion
  
-@@ -21975,8 +23376,8 @@
+@@ -21975,8 +23381,8 @@
  
      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -24953,7 +25049,7 @@
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22002,17 +23403,17 @@
+@@ -22002,17 +23408,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -24977,7 +25073,7 @@
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22027,32 +23428,33 @@
+@@ -22027,32 +23433,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25019,7 +25115,7 @@
          GMSGFMT=":"
        fi
        MSGFMT=$GMSGFMT
-@@ -22061,8 +23463,8 @@
+@@ -22061,8 +23468,8 @@
  
        # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -25030,7 +25126,7 @@
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22088,11 +23490,11 @@
+@@ -22088,11 +23495,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -25046,7 +25142,7 @@
  fi
  
  
-@@ -22100,8 +23502,8 @@
+@@ -22100,8 +23507,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -25057,7 +25153,7 @@
  	  XGETTEXT=":"
  	fi
        fi
-@@ -22195,8 +23597,7 @@
+@@ -22195,8 +23602,7 @@
  
  
  
@@ -25067,7 +25163,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'
-@@ -22208,8 +23609,8 @@
+@@ -22208,8 +23614,8 @@
      ac_save_CXXFLAGS="$CXXFLAGS"
      CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
  
@@ -25078,7 +25174,7 @@
      if test "${kde_cv_stl_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22237,24 +23638,36 @@
+@@ -22237,24 +23643,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -25123,15 +25219,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22263,15 +23676,16 @@
+@@ -22263,15 +23681,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -kde_cv_stl_works=no
 +	kde_cv_stl_works=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
  
@@ -25143,7 +25240,7 @@
  
     if test "$kde_cv_stl_works" = "yes"; then
       # back compatible
-@@ -22300,15 +23714,14 @@
+@@ -22300,15 +23719,14 @@
  
  
  
@@ -25162,7 +25259,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'
-@@ -22320,9 +23733,6 @@
+@@ -22320,9 +23738,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25172,7 +25269,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22348,24 +23758,36 @@
+@@ -22348,24 +23763,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -25217,18 +25314,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22374,8 +23796,9 @@
+@@ -22374,9 +23801,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -kde_cv_func_strlcat=no
 +	kde_cv_func_strlcat=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -22389,11 +23812,11 @@
+ ac_ext=c
+@@ -22389,11 +23817,11 @@
  fi
  
  
@@ -25244,7 +25343,7 @@
  if test "${kde_cv_proto_strlcat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22414,8 +23837,7 @@
+@@ -22414,8 +23842,7 @@
  if test "x$kde_cv_proto_strlcat" = xunknown; then
  
  
@@ -25254,7 +25353,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22453,24 +23875,36 @@
+@@ -22453,24 +23880,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25299,7 +25398,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22480,9 +23914,10 @@
+@@ -22480,10 +23919,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25307,11 +25406,13 @@
 +	kde_cv_proto_strlcat="strlcat unavailable"
  
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -22496,8 +23931,8 @@
+ ac_ext=c
+@@ -22496,8 +23936,8 @@
  
  fi
  
@@ -25322,7 +25423,7 @@
  
  if test "x$kde_cv_func_strlcat" = xyes; then
  
-@@ -22521,15 +23956,14 @@
+@@ -22521,15 +23961,14 @@
  
  
  
@@ -25341,7 +25442,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'
-@@ -22541,9 +23975,6 @@
+@@ -22541,9 +23980,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25351,7 +25452,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22568,24 +23999,36 @@
+@@ -22568,24 +24004,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -25396,18 +25497,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22594,8 +24037,9 @@
+@@ -22594,9 +24042,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -kde_cv_func_strlcpy=no
 +	kde_cv_func_strlcpy=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -22609,11 +24053,11 @@
+ ac_ext=c
+@@ -22609,11 +24058,11 @@
  fi
  
  
@@ -25423,7 +25526,7 @@
  if test "${kde_cv_proto_strlcpy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22634,8 +24078,7 @@
+@@ -22634,8 +24083,7 @@
  if test "x$kde_cv_proto_strlcpy" = xunknown; then
  
  
@@ -25433,7 +25536,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'
-@@ -22672,24 +24115,36 @@
+@@ -22672,24 +24120,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25478,7 +25581,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22699,9 +24154,10 @@
+@@ -22699,10 +24159,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25486,11 +25589,13 @@
 +	kde_cv_proto_strlcpy="strlcpy unavailable"
  
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -22715,8 +24171,8 @@
+ ac_ext=c
+@@ -22715,8 +24176,8 @@
  
  fi
  
@@ -25501,7 +25606,7 @@
  
  if test "x$kde_cv_func_strlcpy" = xyes; then
  
-@@ -22739,8 +24195,8 @@
+@@ -22739,8 +24200,8 @@
  
  
  
@@ -25512,7 +25617,7 @@
  if test "${ac_cv_lib_util_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22757,30 +24213,42 @@
+@@ -22757,30 +24218,42 @@
  int
  main ()
  {
@@ -25564,15 +25669,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22789,20 +24257,21 @@
+@@ -22789,20 +24262,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_util_main=no
 +	ac_cv_lib_util_main=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -25591,7 +25697,7 @@
  if test "${ac_cv_lib_compat_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22819,30 +24288,42 @@
+@@ -22819,30 +24293,42 @@
  int
  main ()
  {
@@ -25643,15 +25749,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22851,21 +24332,22 @@
+@@ -22851,21 +24337,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_compat_main=no
 +	ac_cv_lib_compat_main=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -25671,7 +25778,7 @@
  if test "${ac_cv_lib_crypt_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22878,40 +24360,52 @@
+@@ -22878,40 +24365,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -25736,15 +25843,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22920,19 +24414,20 @@
+@@ -22920,19 +24419,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_crypt_crypt=no
 +	ac_cv_lib_crypt_crypt=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -25762,7 +25870,7 @@
  if test "${ac_cv_lib_c_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22945,40 +24440,52 @@
+@@ -22945,40 +24445,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -25827,15 +25935,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22987,14 +24494,15 @@
+@@ -22987,14 +24499,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_c_crypt=no
 +	ac_cv_lib_c_crypt=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -25846,7 +25955,7 @@
  if test $ac_cv_lib_c_crypt = yes; then
    kde_have_crypt=yes
  else
-@@ -23020,13 +24528,13 @@
+@@ -23020,13 +24533,13 @@
  
     fi
  
@@ -25863,7 +25972,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'
-@@ -23055,24 +24563,36 @@
+@@ -23055,24 +24568,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -25908,17 +26017,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23084,7 +24604,9 @@
+@@ -23084,8 +24609,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
        ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -23095,17 +24617,17 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -23095,17 +24622,17 @@
  
  fi
  
@@ -25941,7 +26052,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'
-@@ -23134,24 +24656,36 @@
+@@ -23134,24 +24661,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -25986,17 +26097,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23163,7 +24697,9 @@
+@@ -23163,8 +24702,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
           done
           ac_ext=c
-@@ -23175,8 +24711,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23175,8 +24716,8 @@
  
  fi
  
@@ -26007,7 +26120,7 @@
     fi
  
  cat >>confdefs.h <<_ACEOF
-@@ -23189,8 +24725,8 @@
+@@ -23189,8 +24730,8 @@
  _ACEOF
  
  
@@ -26018,7 +26131,7 @@
  if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23203,40 +24739,52 @@
+@@ -23203,40 +24744,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26083,15 +26196,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23245,21 +24793,22 @@
+@@ -23245,21 +24798,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_dnet_dnet_ntoa=no
 +	ac_cv_lib_dnet_dnet_ntoa=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -26111,7 +26225,7 @@
  if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23272,40 +24821,52 @@
+@@ -23272,40 +24826,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26176,15 +26290,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23314,21 +24875,22 @@
+@@ -23314,21 +24880,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_dnet_stub_dnet_ntoa=no
 +	ac_cv_lib_dnet_stub_dnet_ntoa=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -26204,7 +26319,7 @@
  if test "${ac_cv_func_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23355,53 +24917,59 @@
+@@ -23355,53 +24922,59 @@
  
  #undef inet_ntoa
  
@@ -26283,15 +26398,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23410,17 +24978,18 @@
+@@ -23410,17 +24983,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_inet_ntoa=no
 +	ac_cv_func_inet_ntoa=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
@@ -26307,7 +26423,7 @@
  if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23433,40 +25002,52 @@
+@@ -23433,40 +25007,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26372,15 +26488,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23475,21 +25056,22 @@
+@@ -23475,21 +25061,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_nsl_inet_ntoa=no
 +	ac_cv_lib_nsl_inet_ntoa=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -26400,7 +26517,7 @@
  if test "${ac_cv_func_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23516,53 +25098,59 @@
+@@ -23516,53 +25103,59 @@
  
  #undef connect
  
@@ -26479,15 +26596,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23571,17 +25159,18 @@
+@@ -23571,17 +25164,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_connect=no
 +	ac_cv_func_connect=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -26503,7 +26621,7 @@
  if test "${ac_cv_lib_socket_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23594,40 +25183,52 @@
+@@ -23594,40 +25188,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26568,15 +26686,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23636,22 +25237,23 @@
+@@ -23636,22 +25242,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_socket_connect=no
 +	ac_cv_lib_socket_connect=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -26597,7 +26716,7 @@
  if test "${ac_cv_func_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23678,53 +25280,59 @@
+@@ -23678,53 +25285,59 @@
  
  #undef remove
  
@@ -26676,15 +26795,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23733,17 +25341,18 @@
+@@ -23733,17 +25346,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_remove=no
 +	ac_cv_func_remove=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -26700,7 +26820,7 @@
  if test "${ac_cv_lib_posix_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23756,40 +25365,52 @@
+@@ -23756,40 +25370,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26765,15 +26885,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23798,14 +25419,15 @@
+@@ -23798,14 +25424,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_posix_remove=no
 +	ac_cv_lib_posix_remove=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -26784,7 +26905,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -23813,8 +25435,8 @@
+@@ -23813,8 +25440,8 @@
     fi
  
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -26795,7 +26916,7 @@
  if test "${ac_cv_func_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23841,53 +25463,59 @@
+@@ -23841,53 +25468,59 @@
  
  #undef shmat
  
@@ -26874,15 +26995,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23896,18 +25524,19 @@
+@@ -23896,18 +25529,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_shmat=no
 +	ac_cv_func_shmat=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -26899,7 +27021,7 @@
  if test "${ac_cv_lib_ipc_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23920,40 +25549,52 @@
+@@ -23920,40 +25554,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26964,15 +27086,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23962,14 +25603,15 @@
+@@ -23962,14 +25608,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_ipc_shmat=no
 +	ac_cv_lib_ipc_shmat=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -26983,7 +27106,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -23983,18 +25625,19 @@
+@@ -23983,18 +25630,19 @@
  for ac_header in sys/types.h stdint.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27011,7 +27134,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24005,24 +25648,36 @@
+@@ -24005,24 +25653,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27056,17 +27179,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24031,15 +25686,16 @@
+@@ -24031,15 +25691,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -27078,7 +27202,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24048,8 +25704,13 @@
+@@ -24048,8 +25709,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -27094,7 +27218,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24073,9 +25734,10 @@
+@@ -24073,9 +25739,10 @@
  
    ac_header_preproc=no
  fi
@@ -27107,7 +27231,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24099,25 +25761,19 @@
+@@ -24099,25 +25766,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;}
@@ -27140,7 +27264,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24135,18 +25791,19 @@
+@@ -24135,18 +25796,19 @@
  for ac_header in sys/bitypes.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27168,7 +27292,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24157,24 +25814,36 @@
+@@ -24157,24 +25819,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27213,17 +27337,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24183,15 +25852,16 @@
+@@ -24183,15 +25857,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -27235,7 +27360,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24200,8 +25870,13 @@
+@@ -24200,8 +25875,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -27251,7 +27376,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24225,9 +25900,10 @@
+@@ -24225,9 +25905,10 @@
  
    ac_header_preproc=no
  fi
@@ -27264,7 +27389,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24251,25 +25927,19 @@
+@@ -24251,25 +25932,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;}
@@ -27297,7 +27422,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24283,8 +25953,8 @@
+@@ -24283,8 +25958,8 @@
  
  
     # darwin requires a poll emulation library
@@ -27308,7 +27433,7 @@
  if test "${ac_cv_lib_poll_poll+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24297,40 +25967,52 @@
+@@ -24297,40 +25972,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27373,15 +27498,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24339,14 +26021,15 @@
+@@ -24339,14 +26026,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_poll_poll=no
 +	ac_cv_lib_poll_poll=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -27392,7 +27518,7 @@
  if test $ac_cv_lib_poll_poll = yes; then
    LIB_POLL="-lpoll"
  fi
-@@ -24357,18 +26040,19 @@
+@@ -24357,18 +26045,19 @@
  for ac_header in Carbon/Carbon.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27420,7 +27546,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24379,24 +26063,36 @@
+@@ -24379,24 +26068,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27465,17 +27591,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24405,15 +26101,16 @@
+@@ -24405,15 +26106,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -27487,7 +27614,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24422,8 +26119,13 @@
+@@ -24422,8 +26124,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -27503,7 +27630,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24447,9 +26149,10 @@
+@@ -24447,9 +26154,10 @@
  
    ac_header_preproc=no
  fi
@@ -27516,7 +27643,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24473,25 +26176,19 @@
+@@ -24473,25 +26181,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;}
@@ -27549,7 +27676,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24506,17 +26203,17 @@
+@@ -24506,17 +26208,17 @@
  
     # CoreAudio framework
     if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -27573,7 +27700,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24527,24 +26224,36 @@
+@@ -24527,24 +26229,36 @@
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27618,17 +27745,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24553,15 +26262,16 @@
+@@ -24553,15 +26267,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -27640,7 +27768,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24570,8 +26280,13 @@
+@@ -24570,8 +26285,13 @@
  /* end confdefs.h.  */
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
@@ -27656,7 +27784,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24595,9 +26310,10 @@
+@@ -24595,9 +26315,10 @@
  
    ac_header_preproc=no
  fi
@@ -27669,7 +27797,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24621,25 +26337,18 @@
+@@ -24621,25 +26342,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;}
@@ -27700,7 +27828,7 @@
  
  fi
  if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24656,8 +26365,8 @@
+@@ -24656,8 +26370,8 @@
  
  
  
@@ -27711,7 +27839,7 @@
    kde_libs_safe="$LIBS"
    LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
    cat >conftest.$ac_ext <<_ACEOF
-@@ -24683,31 +26392,43 @@
+@@ -24683,31 +26397,43 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27765,7 +27893,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RES_INIT 1
-@@ -24718,25 +26439,25 @@
+@@ -24718,25 +26444,25 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27775,8 +27903,9 @@
 +echo "${ECHO_T}no" >&6; }
  
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$kde_libs_safe
  
@@ -27797,7 +27926,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'
-@@ -24748,9 +26469,6 @@
+@@ -24748,9 +26474,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27807,7 +27936,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24776,24 +26494,36 @@
+@@ -24776,24 +26499,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27852,18 +27981,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24802,8 +26532,9 @@
+@@ -24802,9 +26537,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -kde_cv_func_res_init=no
 +	kde_cv_func_res_init=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -24817,11 +26548,11 @@
+ ac_ext=c
+@@ -24817,11 +26553,11 @@
  fi
  
  
@@ -27879,7 +28010,7 @@
  if test "${kde_cv_proto_res_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24842,8 +26573,7 @@
+@@ -24842,8 +26578,7 @@
  if test "x$kde_cv_proto_res_init" = xunknown; then
  
  
@@ -27889,7 +28020,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'
-@@ -24881,24 +26611,36 @@
+@@ -24881,24 +26616,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27934,7 +28065,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24908,9 +26650,10 @@
+@@ -24908,10 +26655,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27942,11 +28073,13 @@
 +	kde_cv_proto_res_init="res_init unavailable"
  
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -24924,8 +26667,8 @@
+ ac_ext=c
+@@ -24924,8 +26672,8 @@
  
  fi
  
@@ -27957,7 +28090,7 @@
  
  if test "x$kde_cv_func_res_init" = xyes; then
  
-@@ -24952,8 +26695,8 @@
+@@ -24952,8 +26700,8 @@
     LIBSOCKET="$X_EXTRA_LIBS"
  
  
@@ -27968,7 +28101,7 @@
  if test "${ac_cv_lib_ucb_killpg+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24966,40 +26709,52 @@
+@@ -24966,40 +26714,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28033,15 +28166,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25008,27 +26763,28 @@
+@@ -25008,27 +26768,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_ucb_killpg=no
 +	ac_cv_lib_ucb_killpg=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -28071,7 +28205,7 @@
  if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25041,40 +26797,52 @@
+@@ -25041,40 +26802,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28136,15 +28270,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25083,22 +26851,23 @@
+@@ -25083,22 +26856,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_bsd_gethostbyname=no
 +	ac_cv_lib_bsd_gethostbyname=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -28165,7 +28300,7 @@
  if test "${ac_cv_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25109,36 +26878,49 @@
+@@ -25109,36 +26883,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28225,15 +28360,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25147,20 +26929,21 @@
+@@ -25147,20 +26934,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_type_int=no
 +	ac_cv_type_int=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
 -echo "${ECHO_T}$ac_cv_type_int" >&6
@@ -28253,7 +28389,7 @@
    # 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.
-@@ -25173,10 +26956,11 @@
+@@ -25173,10 +26961,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28266,7 +28402,7 @@
  test_array [0] = 0
  
    ;
-@@ -25184,24 +26968,36 @@
+@@ -25184,24 +26973,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28311,7 +28447,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25214,10 +27010,11 @@
+@@ -25214,10 +27015,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28324,7 +28460,7 @@
  test_array [0] = 0
  
    ;
-@@ -25225,24 +27022,36 @@
+@@ -25225,24 +27027,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28369,7 +28505,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25251,30 +27060,32 @@
+@@ -25251,30 +27065,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28386,8 +28522,9 @@
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
@@ -28410,7 +28547,7 @@
  test_array [0] = 0
  
    ;
-@@ -25282,24 +27093,36 @@
+@@ -25282,24 +27098,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28455,7 +28592,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25312,10 +27135,11 @@
+@@ -25312,10 +27140,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28468,7 +28605,7 @@
  test_array [0] = 0
  
    ;
-@@ -25323,24 +27147,36 @@
+@@ -25323,24 +27152,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28513,7 +28650,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25349,23 +27185,26 @@
+@@ -25349,24 +27190,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28530,8 +28667,9 @@
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
@@ -28540,14 +28678,17 @@
 -ac_lo= ac_hi=
 +	ac_lo= ac_hi=
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25377,10 +27216,11 @@
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25377,10 +27221,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28560,7 +28701,7 @@
  test_array [0] = 0
  
    ;
-@@ -25388,24 +27228,36 @@
+@@ -25388,24 +27233,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28605,15 +28746,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25414,26 +27266,20 @@
+@@ -25414,26 +27271,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_int=$ac_lo;;
@@ -28637,7 +28779,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25441,8 +27287,9 @@
+@@ -25441,8 +27292,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28649,7 +28791,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -25451,35 +27298,44 @@
+@@ -25451,35 +27303,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -28707,7 +28849,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25490,28 +27346,27 @@
+@@ -25490,28 +27351,27 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -28744,7 +28886,7 @@
  if test "${ac_cv_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25522,36 +27377,49 @@
+@@ -25522,36 +27382,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28804,15 +28946,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25560,20 +27428,21 @@
+@@ -25560,20 +27433,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_type_short=no
 +	ac_cv_type_short=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
 -echo "${ECHO_T}$ac_cv_type_short" >&6
@@ -28832,7 +28975,7 @@
    # 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.
-@@ -25586,10 +27455,11 @@
+@@ -25586,10 +27460,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28845,7 +28988,7 @@
  test_array [0] = 0
  
    ;
-@@ -25597,24 +27467,36 @@
+@@ -25597,24 +27472,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28890,7 +29033,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25627,10 +27509,11 @@
+@@ -25627,10 +27514,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28903,7 +29046,7 @@
  test_array [0] = 0
  
    ;
-@@ -25638,24 +27521,36 @@
+@@ -25638,24 +27526,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28948,7 +29091,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25664,30 +27559,32 @@
+@@ -25664,30 +27564,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28965,8 +29108,9 @@
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
@@ -28989,7 +29133,7 @@
  test_array [0] = 0
  
    ;
-@@ -25695,24 +27592,36 @@
+@@ -25695,24 +27597,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29034,7 +29178,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25725,10 +27634,11 @@
+@@ -25725,10 +27639,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29047,7 +29191,7 @@
  test_array [0] = 0
  
    ;
-@@ -25736,24 +27646,36 @@
+@@ -25736,24 +27651,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29092,7 +29236,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25762,23 +27684,26 @@
+@@ -25762,24 +27689,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29109,8 +29253,9 @@
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
@@ -29119,14 +29264,17 @@
 -ac_lo= ac_hi=
 +	ac_lo= ac_hi=
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25790,10 +27715,11 @@
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25790,10 +27720,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29139,7 +29287,7 @@
  test_array [0] = 0
  
    ;
-@@ -25801,24 +27727,36 @@
+@@ -25801,24 +27732,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29184,15 +29332,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25827,26 +27765,20 @@
+@@ -25827,26 +27770,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_short=$ac_lo;;
@@ -29216,7 +29365,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25854,8 +27786,9 @@
+@@ -25854,8 +27791,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29228,7 +29377,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -25864,35 +27797,44 @@
+@@ -25864,35 +27802,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -29286,7 +29435,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25903,28 +27845,27 @@
+@@ -25903,28 +27850,27 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -29323,7 +29472,7 @@
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25935,36 +27876,49 @@
+@@ -25935,36 +27881,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29383,15 +29532,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25973,20 +27927,21 @@
+@@ -25973,20 +27932,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_type_long=no
 +	ac_cv_type_long=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
 -echo "${ECHO_T}$ac_cv_type_long" >&6
@@ -29411,7 +29561,7 @@
    # 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.
-@@ -25999,10 +27954,11 @@
+@@ -25999,10 +27959,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29424,7 +29574,7 @@
  test_array [0] = 0
  
    ;
-@@ -26010,24 +27966,36 @@
+@@ -26010,24 +27971,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29469,7 +29619,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26040,10 +28008,11 @@
+@@ -26040,10 +28013,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29482,7 +29632,7 @@
  test_array [0] = 0
  
    ;
-@@ -26051,24 +28020,36 @@
+@@ -26051,24 +28025,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29527,7 +29677,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26077,30 +28058,32 @@
+@@ -26077,30 +28063,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29544,8 +29694,9 @@
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
@@ -29568,7 +29719,7 @@
  test_array [0] = 0
  
    ;
-@@ -26108,24 +28091,36 @@
+@@ -26108,24 +28096,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29613,7 +29764,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26138,10 +28133,11 @@
+@@ -26138,10 +28138,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29626,7 +29777,7 @@
  test_array [0] = 0
  
    ;
-@@ -26149,24 +28145,36 @@
+@@ -26149,24 +28150,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29671,7 +29822,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26175,23 +28183,26 @@
+@@ -26175,24 +28188,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29688,8 +29839,9 @@
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
@@ -29698,14 +29850,17 @@
 -ac_lo= ac_hi=
 +	ac_lo= ac_hi=
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26203,10 +28214,11 @@
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26203,10 +28219,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29718,7 +29873,7 @@
  test_array [0] = 0
  
    ;
-@@ -26214,24 +28226,36 @@
+@@ -26214,24 +28231,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29763,15 +29918,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26240,26 +28264,20 @@
+@@ -26240,26 +28269,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_long=$ac_lo;;
@@ -29795,7 +29951,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26267,8 +28285,9 @@
+@@ -26267,8 +28290,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29807,7 +29963,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -26277,35 +28296,44 @@
+@@ -26277,35 +28301,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -29865,7 +30021,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26316,28 +28344,27 @@
+@@ -26316,28 +28349,27 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -29902,7 +30058,7 @@
  if test "${ac_cv_type_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26348,36 +28375,49 @@
+@@ -26348,36 +28380,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29962,15 +30118,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26386,20 +28426,21 @@
+@@ -26386,20 +28431,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_type_char_p=no
 +	ac_cv_type_char_p=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
 -echo "${ECHO_T}$ac_cv_type_char_p" >&6
@@ -29990,7 +30147,7 @@
    # 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.
-@@ -26412,10 +28453,11 @@
+@@ -26412,10 +28458,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30003,7 +30160,7 @@
  test_array [0] = 0
  
    ;
-@@ -26423,24 +28465,36 @@
+@@ -26423,24 +28470,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30048,7 +30205,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26453,10 +28507,11 @@
+@@ -26453,10 +28512,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30061,7 +30218,7 @@
  test_array [0] = 0
  
    ;
-@@ -26464,24 +28519,36 @@
+@@ -26464,24 +28524,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30106,7 +30263,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26490,30 +28557,32 @@
+@@ -26490,30 +28562,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30123,8 +30280,9 @@
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
@@ -30147,7 +30305,7 @@
  test_array [0] = 0
  
    ;
-@@ -26521,24 +28590,36 @@
+@@ -26521,24 +28595,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30192,7 +30350,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26551,10 +28632,11 @@
+@@ -26551,10 +28637,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30205,7 +30363,7 @@
  test_array [0] = 0
  
    ;
-@@ -26562,24 +28644,36 @@
+@@ -26562,24 +28649,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30250,7 +30408,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26588,23 +28682,26 @@
+@@ -26588,24 +28687,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30267,8 +30425,9 @@
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
@@ -30277,14 +30436,17 @@
 -ac_lo= ac_hi=
 +	ac_lo= ac_hi=
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26616,10 +28713,11 @@
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26616,10 +28718,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30297,7 +30459,7 @@
  test_array [0] = 0
  
    ;
-@@ -26627,24 +28725,36 @@
+@@ -26627,24 +28730,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30342,15 +30504,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26653,26 +28763,20 @@
+@@ -26653,26 +28768,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_char_p=$ac_lo;;
@@ -30374,7 +30537,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26680,8 +28784,9 @@
+@@ -26680,8 +28789,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30386,7 +30549,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -26690,35 +28795,44 @@
+@@ -26690,35 +28800,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -30444,7 +30607,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26729,30 +28843,29 @@
+@@ -26729,30 +28848,29 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -30483,7 +30646,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26765,40 +28878,52 @@
+@@ -26765,40 +28883,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -30548,15 +30711,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26807,14 +28932,15 @@
+@@ -26807,14 +28937,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_dl_dlopen=no
 +	ac_cv_lib_dl_dlopen=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -30567,7 +30731,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
  
  LIBDL="-ldl"
-@@ -26823,8 +28949,8 @@
+@@ -26823,8 +28954,8 @@
  fi
  
  
@@ -30578,7 +30742,7 @@
  if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26837,40 +28963,52 @@
+@@ -26837,40 +28968,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -30643,15 +30807,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26879,14 +29017,15 @@
+@@ -26879,14 +29022,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_dld_shl_unload=no
 +	ac_cv_lib_dld_shl_unload=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -30662,7 +30827,7 @@
  if test $ac_cv_lib_dld_shl_unload = yes; then
  
  LIBDL="-ldld"
-@@ -26900,8 +29039,8 @@
+@@ -26900,8 +29044,8 @@
  
  
  
@@ -30673,7 +30838,7 @@
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26912,36 +29051,49 @@
+@@ -26912,36 +29056,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30733,15 +30898,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26950,20 +29102,21 @@
+@@ -26950,20 +29107,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_type_size_t=no
 +	ac_cv_type_size_t=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
 -echo "${ECHO_T}$ac_cv_type_size_t" >&6
@@ -30761,7 +30927,7 @@
    # 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.
-@@ -26976,10 +29129,11 @@
+@@ -26976,10 +29134,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30774,7 +30940,7 @@
  test_array [0] = 0
  
    ;
-@@ -26987,24 +29141,36 @@
+@@ -26987,24 +29146,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30819,7 +30985,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27017,10 +29183,11 @@
+@@ -27017,10 +29188,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30832,7 +30998,7 @@
  test_array [0] = 0
  
    ;
-@@ -27028,24 +29195,36 @@
+@@ -27028,24 +29200,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30877,7 +31043,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27054,30 +29233,32 @@
+@@ -27054,30 +29238,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30894,8 +31060,9 @@
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
@@ -30918,7 +31085,7 @@
  test_array [0] = 0
  
    ;
-@@ -27085,24 +29266,36 @@
+@@ -27085,24 +29271,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30963,7 +31130,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27115,10 +29308,11 @@
+@@ -27115,10 +29313,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30976,7 +31143,7 @@
  test_array [0] = 0
  
    ;
-@@ -27126,24 +29320,36 @@
+@@ -27126,24 +29325,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31021,7 +31188,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27152,23 +29358,26 @@
+@@ -27152,24 +29363,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31038,8 +31205,9 @@
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
@@ -31048,14 +31216,17 @@
 -ac_lo= ac_hi=
 +	ac_lo= ac_hi=
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27180,10 +29389,11 @@
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27180,10 +29394,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31068,7 +31239,7 @@
  test_array [0] = 0
  
    ;
-@@ -27191,24 +29401,36 @@
+@@ -27191,24 +29406,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31113,15 +31284,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27217,26 +29439,20 @@
+@@ -27217,26 +29444,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_size_t=$ac_lo;;
@@ -31145,7 +31317,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27244,8 +29460,9 @@
+@@ -27244,8 +29465,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31157,7 +31329,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -27254,35 +29471,44 @@
+@@ -27254,35 +29476,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31215,7 +31387,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27293,29 +29519,28 @@
+@@ -27293,29 +29524,28 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -31253,7 +31425,7 @@
  if test "${ac_cv_type_unsigned_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -27326,36 +29551,49 @@
+@@ -27326,36 +29556,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31313,15 +31485,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27364,20 +29602,21 @@
+@@ -27364,20 +29607,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_type_unsigned_long=no
 +	ac_cv_type_unsigned_long=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
 -echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
@@ -31341,7 +31514,7 @@
    # 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.
-@@ -27390,10 +29629,11 @@
+@@ -27390,10 +29634,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31354,7 +31527,7 @@
  test_array [0] = 0
  
    ;
-@@ -27401,24 +29641,36 @@
+@@ -27401,24 +29646,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31399,7 +31572,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27431,10 +29683,11 @@
+@@ -27431,10 +29688,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31412,7 +31585,7 @@
  test_array [0] = 0
  
    ;
-@@ -27442,24 +29695,36 @@
+@@ -27442,24 +29700,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31457,7 +31630,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27468,30 +29733,32 @@
+@@ -27468,30 +29738,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31474,8 +31647,9 @@
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
@@ -31498,7 +31672,7 @@
  test_array [0] = 0
  
    ;
-@@ -27499,24 +29766,36 @@
+@@ -27499,24 +29771,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31543,7 +31717,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27529,10 +29808,11 @@
+@@ -27529,10 +29813,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31556,7 +31730,7 @@
  test_array [0] = 0
  
    ;
-@@ -27540,24 +29820,36 @@
+@@ -27540,24 +29825,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31601,7 +31775,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27566,23 +29858,26 @@
+@@ -27566,24 +29863,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31618,8 +31792,9 @@
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
@@ -31628,14 +31803,17 @@
 -ac_lo= ac_hi=
 +	ac_lo= ac_hi=
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27594,10 +29889,11 @@
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27594,10 +29894,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31648,7 +31826,7 @@
  test_array [0] = 0
  
    ;
-@@ -27605,24 +29901,36 @@
+@@ -27605,24 +29906,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31693,15 +31871,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27631,26 +29939,20 @@
+@@ -27631,26 +29944,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
@@ -31725,7 +31904,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27658,8 +29960,9 @@
+@@ -27658,8 +29965,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31737,7 +31916,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -27668,35 +29971,44 @@
+@@ -27668,35 +29976,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31795,7 +31974,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27707,30 +30019,29 @@
+@@ -27707,30 +30024,29 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -31834,7 +32013,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27751,36 +30062,48 @@
+@@ -27751,36 +30067,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31895,16 +32074,17 @@
        { { echo "$as_me:$LINENO: error:
         Apparently on your system our assumption sizeof size_t == sizeof unsigned long
         does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27792,18 +30115,18 @@
+@@ -27792,18 +30120,18 @@
     { (exit 1); exit 1; }; }
  
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
 -  echo "$as_me:$LINENO: checking for PIE support" >&5
 -echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
++
 +  { echo "$as_me:$LINENO: checking for PIE support" >&5
 +echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
  if test "${kde_cv_val_pie_support+set}" = set; then
@@ -31918,7 +32098,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'
-@@ -27833,24 +30156,36 @@
+@@ -27833,24 +30161,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -31963,18 +32143,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27859,8 +30194,9 @@
+@@ -27859,9 +30199,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -kde_cv_val_pie_support=no
 +	kde_cv_val_pie_support=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -27874,26 +30210,26 @@
+     CXXFLAGS=$safe_CXXFLAGS
+@@ -27874,26 +30215,26 @@
  
  
  fi
@@ -32011,7 +32193,7 @@
  
    KDE_USE_FPIE=""
    KDE_USE_PIE=""
-@@ -27912,18 +30248,19 @@
+@@ -27912,18 +30253,19 @@
  for ac_header in crt_externs.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -32039,7 +32221,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27934,24 +30271,36 @@
+@@ -27934,24 +30276,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32084,17 +32266,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27960,15 +30309,16 @@
+@@ -27960,15 +30314,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -32106,7 +32289,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27977,8 +30327,13 @@
+@@ -27977,8 +30332,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -32122,7 +32305,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -28002,9 +30357,10 @@
+@@ -28002,9 +30362,10 @@
  
    ac_header_preproc=no
  fi
@@ -32135,7 +32318,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -28028,25 +30384,19 @@
+@@ -28028,25 +30389,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;}
@@ -32168,7 +32351,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -28058,8 +30408,8 @@
+@@ -28058,8 +30413,8 @@
  
  done
  
@@ -32179,7 +32362,7 @@
  if test "${ac_cv_func__NSGetEnviron+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28086,53 +30436,59 @@
+@@ -28086,53 +30441,59 @@
  
  #undef _NSGetEnviron
  
@@ -32258,15 +32441,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28141,13 +30497,14 @@
+@@ -28141,13 +30502,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func__NSGetEnviron=no
 +	ac_cv_func__NSGetEnviron=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
@@ -32276,7 +32460,7 @@
  if test $ac_cv_func__NSGetEnviron = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -28168,9 +30525,9 @@
+@@ -28168,9 +30530,9 @@
  for ac_func in vsnprintf snprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -32289,7 +32473,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -28196,53 +30553,59 @@
+@@ -28196,53 +30558,59 @@
  
  #undef $ac_func
  
@@ -32368,15 +32552,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28251,13 +30614,15 @@
+@@ -28251,13 +30619,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -32387,7 +32572,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28274,32 +30639,32 @@
+@@ -28274,32 +30644,32 @@
  
  
  
@@ -32432,7 +32617,7 @@
  
  # used to disable x11-specific stuff on special platforms
  
-@@ -28315,8 +30680,8 @@
+@@ -28315,8 +30685,8 @@
  
  if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
  
@@ -32443,7 +32628,7 @@
  
  if test "${kde_cv_have_x+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28353,8 +30718,13 @@
+@@ -28353,8 +30723,13 @@
  /* end confdefs.h.  */
  #include <$x_direct_test_include>
  _ACEOF
@@ -32459,7 +32644,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -28421,6 +30791,7 @@
+@@ -28421,6 +30796,7 @@
      fi
    done
  fi
@@ -32467,7 +32652,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = NO
  
-@@ -28450,24 +30821,36 @@
+@@ -28450,24 +30826,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32512,7 +32697,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28478,7 +30861,7 @@
+@@ -28478,7 +30866,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32521,15 +32706,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}/` \
-@@ -28526,6 +30909,7 @@
+@@ -28526,7 +30914,8 @@
    done
  done
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = NO
-@@ -28536,21 +30920,26 @@
+ 
+@@ -28536,21 +30925,26 @@
  *-*-solaris*)
    ;;
  *)
@@ -32564,7 +32751,7 @@
  	ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
-@@ -28558,7 +30947,7 @@
+@@ -28558,7 +30952,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
@@ -32573,7 +32760,7 @@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
-@@ -28567,7 +30956,7 @@
+@@ -28567,7 +30961,7 @@
      esac
    fi
    cd ..
@@ -32582,7 +32769,7 @@
  fi
  
    if test -z "$ac_x_includes"; then
-@@ -28611,12 +31000,12 @@
+@@ -28611,12 +31005,12 @@
  eval "$kde_cv_have_x"
  
  if test "$have_x" != yes; then
@@ -32599,7 +32786,7 @@
  fi
  
  if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28644,8 +31033,8 @@
+@@ -28644,8 +31038,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.
@@ -32610,7 +32797,7 @@
  if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28658,40 +31047,52 @@
+@@ -28658,40 +31052,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -32675,15 +32862,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28700,14 +31101,15 @@
+@@ -28700,14 +31106,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_ICE_IceConnectionNumber=no
 +	ac_cv_lib_ICE_IceConnectionNumber=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -32694,7 +32882,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    LIBSM="-lSM -lICE"
  fi
-@@ -28716,8 +31118,8 @@
+@@ -28716,8 +31123,8 @@
  
  LIB_X11='-lX11 $(LIBSOCKET)'
  
@@ -32705,7 +32893,7 @@
  if test "${kde_cv_have_libXext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28751,24 +31153,36 @@
+@@ -28751,24 +31158,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32750,7 +32938,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28777,9 +31191,10 @@
+@@ -28777,10 +31196,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32758,11 +32946,13 @@
 +	kde_cv_have_libXext=no
  
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -28789,8 +31204,8 @@
+ LDFLAGS=$kde_ldflags_safe
+@@ -28789,8 +31209,8 @@
  fi
  
  
@@ -32773,7 +32963,7 @@
  
  if test "$kde_cv_have_libXext" = "no"; then
    { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28852,8 +31267,8 @@
+@@ -28852,8 +31272,8 @@
      else
        PTHREAD_LIBS_save="$PTHREAD_LIBS"
        PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -32784,7 +32974,7 @@
  
       kde_save_LDFLAGS="$LDFLAGS"
            kde_save_LIBS="$LIBS"
-@@ -28864,9 +31279,9 @@
+@@ -28864,9 +31284,9 @@
  	;;
       esac
       as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -32797,7 +32987,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -28878,40 +31293,52 @@
+@@ -28878,40 +31298,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -32862,15 +33052,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28920,14 +31347,16 @@
+@@ -28920,14 +31352,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_Lib=no"
 +	eval "$as_ac_Lib=no"
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -32882,7 +33073,7 @@
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
    LIBPTHREAD="$PTHREAD_LIBS_save"
  fi
-@@ -28940,8 +31369,8 @@
+@@ -28940,8 +31374,8 @@
    fi
  
      if test -z "$LIBPTHREAD"; then
@@ -32893,7 +33084,7 @@
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28954,40 +31383,52 @@
+@@ -28954,40 +31388,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -32958,15 +33149,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28996,14 +31437,15 @@
+@@ -28996,14 +31442,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_pthread_pthread_create=no
 +	ac_cv_lib_pthread_pthread_create=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -32977,7 +33169,7 @@
  if test $ac_cv_lib_pthread_pthread_create = yes; then
    LIBPTHREAD="-lpthread"
  fi
-@@ -29011,8 +31453,8 @@
+@@ -29011,8 +31458,8 @@
    fi
  
      if test -z "$LIBPTHREAD" ; then
@@ -32988,7 +33180,7 @@
      kde_safe_libs=$LIBS
      LIBS="$LIBS -lpthread"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -29031,39 +31473,52 @@
+@@ -29031,40 +31478,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33049,11 +33241,13 @@
 +	{ echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
      LIBS=$kde_safe_libs
-@@ -29079,16 +31534,15 @@
+   fi
+@@ -29079,16 +31539,15 @@
        USE_THREADS=""
        if test -z "$LIBPTHREAD"; then
  
@@ -33074,7 +33268,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'
-@@ -29115,24 +31569,36 @@
+@@ -29115,24 +31574,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33119,17 +33313,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29141,7 +31607,9 @@
+@@ -29141,8 +31612,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -29155,13 +31623,13 @@
+   ac_ext=c
+@@ -29155,13 +31628,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33147,7 +33343,7 @@
   :
  
  fi
-@@ -29173,16 +31641,15 @@
+@@ -29173,16 +31646,15 @@
      case $host_os in
   	solaris*)
  
@@ -33168,7 +33364,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'
-@@ -29209,24 +31676,36 @@
+@@ -29209,24 +31681,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33213,17 +33409,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29235,7 +31714,9 @@
+@@ -29235,8 +31719,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -29249,13 +31730,13 @@
+   ac_ext=c
+@@ -29249,13 +31735,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33241,7 +33439,7 @@
   :
  
  fi
-@@ -29282,17 +31763,17 @@
+@@ -29282,17 +31768,17 @@
  
  
  
@@ -33265,7 +33463,7 @@
  kde_extra_includes=
  if test -n "$kde_use_extra_includes" && \
     test "$kde_use_extra_includes" != "NONE"; then
-@@ -29310,21 +31791,21 @@
+@@ -29310,21 +31796,21 @@
  fi
  
  
@@ -33295,7 +33493,7 @@
  if test -n "$kde_use_extra_libs" && \
     test "$kde_use_extra_libs" != "NONE"; then
  
-@@ -29343,14 +31824,14 @@
+@@ -29343,14 +31829,14 @@
  
  
  
@@ -33314,7 +33512,7 @@
  if test "${ac_cv_lib_z+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29384,24 +31865,36 @@
+@@ -29384,24 +31870,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33359,18 +33557,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29410,8 +31903,9 @@
+@@ -29410,9 +31908,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "ac_cv_lib_z=no"
 +	eval "ac_cv_lib_z=no"
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
-@@ -29425,8 +31919,8 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29425,8 +31924,8 @@
  _ACEOF
  
    LIBZ="$ac_cv_lib_z"
@@ -33381,7 +33581,7 @@
  else
    { { echo "$as_me:$LINENO: error: not found.
            Possibly configure picks up an outdated version
-@@ -29446,8 +31940,8 @@
+@@ -29446,8 +31945,8 @@
  
  
  
@@ -33392,7 +33592,7 @@
  if test "${ac_cv_lib_png+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29483,24 +31977,36 @@
+@@ -29483,24 +31982,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33437,7 +33637,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29509,9 +32015,10 @@
+@@ -29509,10 +32020,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33445,11 +33645,13 @@
 +	eval "ac_cv_lib_png=no"
  
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
-@@ -29526,19 +32033,19 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29526,19 +32038,19 @@
  
    LIBPNG="$ac_cv_lib_png"
  
@@ -33475,7 +33677,7 @@
  if test "${ac_cv_lib_jpeg_6b+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29571,24 +32078,36 @@
+@@ -29571,24 +32083,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33520,18 +33722,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29597,8 +32116,9 @@
+@@ -29597,9 +32121,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "ac_cv_lib_jpeg_6b=no"
 +	eval "ac_cv_lib_jpeg_6b=no"
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
-@@ -29609,14 +32129,14 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29609,14 +32134,14 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -33552,7 +33756,7 @@
  if test "${ac_cv_lib_jpeg_normal+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29649,24 +32169,36 @@
+@@ -29649,24 +32174,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33597,18 +33801,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29675,8 +32207,9 @@
+@@ -29675,9 +32212,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "ac_cv_lib_jpeg_normal=no"
 +	eval "ac_cv_lib_jpeg_normal=no"
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
-@@ -29687,11 +32220,11 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29687,11 +32225,11 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -33624,16 +33830,16 @@
  
         LIBJPEG=
  
-@@ -29711,7 +32244,7 @@
+@@ -29711,7 +32249,7 @@
  do
    for j in jpeglib.h;
    do
 -    echo "configure: 29714: $i/$j" >&5
-+    echo "configure: 32247: $i/$j" >&5
++    echo "configure: 32252: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29758,14 +32291,14 @@
+@@ -29758,14 +32296,14 @@
  
  
  
@@ -33651,7 +33857,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -29808,8 +32341,8 @@
+@@ -29808,8 +32346,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33662,7 +33868,7 @@
  
  		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
  We need perl to generate some code." >&5
-@@ -29818,8 +32351,8 @@
+@@ -29818,8 +32356,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -33673,7 +33879,7 @@
        PERL=$kde_cv_path
  
     fi
-@@ -29833,10 +32366,9 @@
+@@ -29833,10 +32371,9 @@
  
  
  
@@ -33686,7 +33892,7 @@
  else
  
      if test $kde_qtver = 3; then
-@@ -29846,7 +32378,8 @@
+@@ -29846,7 +32383,8 @@
      fi
  
  
@@ -33696,7 +33902,7 @@
  
  USING_QT_MT=""
  
-@@ -29866,13 +32399,13 @@
+@@ -29866,13 +32404,13 @@
    else
      kde_check_threading_default=yes
    fi
@@ -33714,7 +33920,7 @@
    if test "x$kde_use_threading" = "xyes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -29944,8 +32477,8 @@
+@@ -29944,8 +32482,8 @@
    LIBQT="$LIBQT $LIBDL"
  fi
  
@@ -33725,7 +33931,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"
-@@ -29954,34 +32487,34 @@
+@@ -29954,34 +32492,34 @@
  qt_libraries=""
  qt_includes=""
  
@@ -33772,16 +33978,16 @@
  
  if test "${ac_cv_have_qt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30009,7 +32542,7 @@
+@@ -30009,7 +32547,7 @@
  do
    for j in $kde_qt_header;
    do
 -    echo "configure: 30012: $i/$j" >&5
-+    echo "configure: 32545: $i/$j" >&5
++    echo "configure: 32550: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30046,8 +32579,7 @@
+@@ -30046,8 +32584,7 @@
  ac_qt_libraries="$qt_libdir"
  
  
@@ -33791,7 +33997,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'
-@@ -30184,13 +32716,13 @@
+@@ -30184,13 +32721,13 @@
  eval "$ac_cv_have_qt"
  
  if test "$have_qt" != yes; then
@@ -33809,7 +34015,7 @@
  
    qt_libraries="$ac_qt_libraries"
    qt_includes="$ac_qt_includes"
-@@ -30199,15 +32731,14 @@
+@@ -30199,15 +32736,14 @@
  if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
  
  
@@ -33828,7 +34034,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'
-@@ -30328,12 +32859,12 @@
+@@ -30328,12 +32864,12 @@
  
  
  if test "$kde_cv_qt_direct" = "yes"; then
@@ -33845,7 +34051,7 @@
  
  fi
  
-@@ -30371,14 +32902,14 @@
+@@ -30371,14 +32907,14 @@
     fi
  
  
@@ -33863,7 +34069,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30421,8 +32952,8 @@
+@@ -30421,8 +32957,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33874,7 +34080,7 @@
  
      { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
  Please check whether you installed Qt correctly.
-@@ -30443,22 +32974,22 @@
+@@ -30443,22 +32979,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -33902,7 +34108,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30501,12 +33032,12 @@
+@@ -30501,12 +33037,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33919,7 +34125,7 @@
        UIC_PATH=$kde_cv_path
  
     fi
-@@ -30536,10 +33067,10 @@
+@@ -30536,10 +33072,10 @@
  
         if test $kde_qtver = 3; then
  
@@ -33933,7 +34139,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30562,22 +33093,22 @@
+@@ -30562,22 +33098,22 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -33963,7 +34169,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30600,13 +33131,13 @@
+@@ -30600,13 +33136,13 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -33981,7 +34187,7 @@
          :
          ac_uic_supports_nounload=no
      fi
-@@ -30637,15 +33168,14 @@
+@@ -30637,15 +33173,14 @@
  
  
  if test -n "$LIBJPEG"; then
@@ -34000,7 +34206,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'
-@@ -30678,24 +33208,36 @@
+@@ -30678,24 +33213,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34045,18 +34251,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -30704,8 +33246,9 @@
+@@ -30704,9 +33251,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "kde_cv_qt_jpeg=yes"
 +	eval "kde_cv_qt_jpeg=yes"
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
-@@ -30722,12 +33265,12 @@
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -30722,12 +33270,12 @@
  
  
  if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -34073,7 +34281,7 @@
    LIBJPEG_QT=
  fi
  
-@@ -30758,15 +33301,15 @@
+@@ -30758,15 +33306,15 @@
  
  
  
@@ -34095,7 +34303,7 @@
  
  if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
  
-@@ -30790,11 +33333,11 @@
+@@ -30790,11 +33338,11 @@
  
  
  
@@ -34111,34 +34319,34 @@
  
  if test "${prefix}" != NONE; then
    kde_includes=${includedir}
-@@ -30846,7 +33389,7 @@
+@@ -30846,7 +33394,7 @@
  do
    for j in $kde_check_header;
    do
 -    echo "configure: 30849: $i/$j" >&5
-+    echo "configure: 33392: $i/$j" >&5
++    echo "configure: 33397: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30876,7 +33419,7 @@
+@@ -30876,7 +33424,7 @@
  do
    for j in $kde_check_lib;
    do
 -    echo "configure: 30879: $i/$j" >&5
-+    echo "configure: 33422: $i/$j" >&5
++    echo "configure: 33427: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30894,7 +33437,7 @@
+@@ -30894,7 +33442,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
 -    echo "configure: 30897: $i/$j" >&5
-+    echo "configure: 33440: $i/$j" >&5
++    echo "configure: 33445: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -30953,12 +33496,12 @@
+@@ -30953,12 +33501,12 @@
   fi
   if test "$exec_prefix" = NONE; then
    ac_kde_exec_prefix="$ac_kde_prefix"
@@ -34155,7 +34363,7 @@
   fi
  
   kde_libraries="${libdir}"
-@@ -30967,8 +33510,8 @@
+@@ -30967,8 +33515,8 @@
  else
    ac_cv_have_kde="have_kde=yes \
      ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -34166,7 +34374,7 @@
  
    kde_libraries="$ac_kde_libraries"
    kde_includes="$ac_kde_includes"
-@@ -31006,8 +33549,8 @@
+@@ -31006,8 +33554,8 @@
  
  if test x$ac_uic_supports_libpath = xyes; then
  
@@ -34177,7 +34385,7 @@
  if test "${kde_cv_uic_plugins+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -31050,8 +33593,8 @@
+@@ -31050,8 +33598,8 @@
  fi
  
  
@@ -34188,7 +34396,7 @@
  if test "$kde_cv_uic_plugins" != yes; then
  	{ { echo "$as_me:$LINENO: error:
  you need to install kdelibs first.
-@@ -31083,10 +33626,9 @@
+@@ -31083,10 +33631,9 @@
  
  
  
@@ -34201,7 +34409,7 @@
    if test "$enableval" = "no";
      then ac_use_path_checking="default"
      else ac_use_path_checking=""
-@@ -31100,13 +33642,14 @@
+@@ -31100,13 +33647,14 @@
    fi
  
  
@@ -34219,7 +34427,7 @@
  kde_result=""
  kde_cached_paths=yes
  if test "${kde_cv_all_paths+set}" = set; then
-@@ -31217,15 +33760,14 @@
+@@ -31217,15 +33765,14 @@
  else
  
    if test $kde_qtver = 1; then
@@ -34240,7 +34448,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'
-@@ -31277,8 +33819,8 @@
+@@ -31277,8 +33824,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -34251,7 +34459,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.
-@@ -31317,8 +33859,8 @@
+@@ -31317,8 +33864,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -34262,7 +34470,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
-@@ -31326,8 +33868,8 @@
+@@ -31326,8 +33873,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -34273,7 +34481,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
-@@ -31520,15 +34062,14 @@
+@@ -31520,15 +34067,14 @@
  else
  
    if test $kde_qtver = 1; then
@@ -34294,7 +34502,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'
-@@ -31580,8 +34121,8 @@
+@@ -31580,8 +34126,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -34305,7 +34513,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.
-@@ -31620,8 +34161,8 @@
+@@ -31620,8 +34166,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -34316,7 +34524,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
-@@ -31629,8 +34170,8 @@
+@@ -31629,8 +34175,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -34327,7 +34535,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
-@@ -31722,22 +34263,22 @@
+@@ -31722,22 +34268,22 @@
     { (exit 1); exit 1; }; }
  else
    rm -f conftest*
@@ -34356,7 +34564,7 @@
  
  
  if test "$build_arts" '!=' "no"; then
-@@ -31770,14 +34311,14 @@
+@@ -31770,14 +34316,14 @@
  
          kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
  
@@ -34374,7 +34582,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31820,8 +34361,8 @@
+@@ -31820,8 +34366,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34385,7 +34593,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
  Please check whether you installed KDE correctly.
-@@ -31832,21 +34373,21 @@
+@@ -31832,21 +34378,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34412,7 +34620,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31889,8 +34430,8 @@
+@@ -31889,8 +34435,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34423,7 +34631,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
  Please check whether you installed KDE correctly.
-@@ -31901,22 +34442,22 @@
+@@ -31901,22 +34447,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34451,7 +34659,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31959,8 +34500,8 @@
+@@ -31959,8 +34505,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34462,7 +34670,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
  Please check whether you installed aRts correctly or use
-@@ -31973,21 +34514,21 @@
+@@ -31973,21 +34519,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34489,7 +34697,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32030,8 +34571,8 @@
+@@ -32030,8 +34576,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34500,7 +34708,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
  Please check whether you installed aRts correctly or use
-@@ -32044,22 +34585,22 @@
+@@ -32044,22 +34590,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34528,7 +34736,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32102,12 +34643,12 @@
+@@ -32102,12 +34648,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34545,7 +34753,7 @@
        MEINPROC=$kde_cv_path
  
     fi
-@@ -32136,14 +34677,14 @@
+@@ -32136,14 +34682,14 @@
  
          if test -n "$kde32ornewer"; then
  
@@ -34563,7 +34771,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32186,8 +34727,8 @@
+@@ -32186,8 +34732,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34574,7 +34782,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
  Please check whether you installed KDE correctly.
-@@ -32198,21 +34739,21 @@
+@@ -32198,21 +34744,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34601,7 +34809,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32255,8 +34796,8 @@
+@@ -32255,8 +34801,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34612,7 +34820,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
  Please check whether you installed KDE correctly.
-@@ -32267,8 +34808,8 @@
+@@ -32267,8 +34813,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34623,7 +34831,7 @@
        DCOPIDLNG=$kde_cv_path
  
     fi
-@@ -32276,14 +34817,14 @@
+@@ -32276,14 +34822,14 @@
          fi
          if test -n "$kde33ornewer"; then
  
@@ -34641,7 +34849,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32326,8 +34867,8 @@
+@@ -32326,8 +34872,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34652,7 +34860,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
  Please check whether you installed KDE correctly.
-@@ -32338,8 +34879,8 @@
+@@ -32338,8 +34884,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34663,7 +34871,7 @@
        MAKEKDEWIDGETS=$kde_cv_path
  
     fi
-@@ -32347,14 +34888,14 @@
+@@ -32347,14 +34893,14 @@
  
          fi
  
@@ -34681,7 +34889,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32397,12 +34938,12 @@
+@@ -32397,12 +34943,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34698,16 +34906,16 @@
        XMLLINT=$kde_cv_path
  
     fi
-@@ -32417,7 +34958,7 @@
+@@ -32417,7 +34963,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
 -    echo "configure: 32420: $i/$j" >&5
-+    echo "configure: 34961: $i/$j" >&5
++    echo "configure: 34966: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32633,8 +35174,8 @@
+@@ -32633,8 +35179,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
@@ -34718,7 +34926,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -32647,32 +35188,34 @@
+@@ -32647,32 +35193,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -34760,7 +34968,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -32685,27 +35228,41 @@
+@@ -32685,27 +35233,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -34809,7 +35017,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -32726,8 +35283,8 @@
+@@ -32726,8 +35288,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -34820,7 +35028,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -32816,8 +35373,8 @@
+@@ -32816,8 +35378,8 @@
  fi
  
  fi
@@ -34831,7 +35039,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -32835,8 +35392,8 @@
+@@ -32835,8 +35397,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -34842,7 +35050,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -32925,8 +35482,8 @@
+@@ -32925,8 +35487,8 @@
  fi
  
  fi
@@ -34853,7 +35061,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -32947,13 +35504,12 @@
+@@ -32947,13 +35509,12 @@
  
  
  
@@ -34870,7 +35078,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'
-@@ -32974,13 +35530,13 @@
+@@ -32974,13 +35535,13 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "GCC visibility push" >/dev/null 2>&1; then
  
@@ -34888,7 +35096,7 @@
        { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
                     visibility support. Disabling -fvisibility=hidden" >&5
  echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
-@@ -33000,16 +35556,15 @@
+@@ -33000,16 +35561,15 @@
  
      kde_have_gcc_visibility=no
  
@@ -34909,7 +35117,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'
-@@ -33036,24 +35591,36 @@
+@@ -33036,24 +35596,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34954,17 +35162,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33062,7 +35629,9 @@
+@@ -33062,8 +35634,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -33076,28 +35645,27 @@
+   ac_ext=c
+@@ -33076,28 +35650,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35002,7 +35212,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'
-@@ -33132,24 +35700,36 @@
+@@ -33132,24 +35705,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -35047,18 +35257,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33158,8 +35738,9 @@
+@@ -33158,9 +35743,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -kde_cv_val_qt_gcc_visibility_patched=yes
 +	kde_cv_val_qt_gcc_visibility_patched=yes
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
            CXXFLAGS=$safe_CXXFLAGS
-@@ -33172,21 +35753,20 @@
+           ac_ext=c
+@@ -33172,21 +35758,20 @@
  
  
  fi
@@ -35085,7 +35297,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,24 +35806,36 @@
+@@ -33226,24 +35811,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35130,18 +35342,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33252,8 +35844,9 @@
+@@ -33252,9 +35849,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -kde_cv_val_gcc_visibility_bug=yes
 +	kde_cv_val_gcc_visibility_bug=yes
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -33268,8 +35861,8 @@
+         CXXFLAGS=$safe_CXXFLAGS
+@@ -33268,8 +35866,8 @@
  
  
  fi
@@ -35152,7 +35366,7 @@
  
      if test x$kde_cv_val_gcc_visibility_bug = xno; then
        CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -33285,8 +35878,8 @@
+@@ -33285,8 +35883,8 @@
        fi
  
  else
@@ -35163,7 +35377,7 @@
   :
  
  fi
-@@ -33294,6 +35887,31 @@
+@@ -33294,6 +35892,31 @@
    fi
  
  
@@ -35195,7 +35409,7 @@
  quanta_datadir='${kde_datadir}/quanta'
  package="quanta"
  
-@@ -33318,9 +35936,9 @@
+@@ -33318,9 +35941,9 @@
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -35208,7 +35422,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -33342,24 +35960,36 @@
+@@ -33342,24 +35965,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -35253,15 +35467,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33368,12 +35998,14 @@
+@@ -33368,12 +36003,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_Header=no"
 +	eval "$as_ac_Header=no"
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -35271,7 +35486,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -33385,13 +36017,12 @@
+@@ -33385,13 +36022,12 @@
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
@@ -35287,7 +35502,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33399,249 +36030,196 @@
+@@ -33399,249 +36035,196 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -35421,46 +35636,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-fi
+-rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -  done
-+      conftest$ac_exeext
-+  if test "${ac_cv_search_opendir+set}" = set; then
-+  break
-+fi
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  :
-+else
-+  ac_cv_search_opendir=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
+-fi
+-LIBS=$ac_func_search_save_LIBS
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
 -echo "${ECHO_T}$ac_cv_search_opendir" >&6
 -if test "$ac_cv_search_opendir" != no; then
 -  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
- else
+-else
 -  echo "$as_me:$LINENO: checking for library containing opendir" >&5
 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext
++  if test "${ac_cv_search_opendir+set}" = set; then
++  break
++fi
++done
  if test "${ac_cv_search_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_func_search_save_LIBS=$LIBS
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
 -ac_cv_search_opendir=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -35507,17 +35709,36 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_search_opendir="none required"
--else
++  :
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
++  ac_cv_search_opendir=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ 
+ fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test "$ac_cv_search_opendir" = no; then
 -  for ac_lib in x; do
 -    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 -    cat >conftest.$ac_ext <<_ACEOF
++
++else
++  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
++if test "${ac_cv_search_opendir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
 +cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -35603,10 +35824,11 @@
  
 +
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -  done
++
++rm -f core conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext
 +  if test "${ac_cv_search_opendir+set}" = set; then
 +  break
@@ -35641,7 +35863,7 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33665,24 +36243,36 @@
+@@ -33665,24 +36248,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -35686,18 +35908,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33691,8 +36281,9 @@
+@@ -33691,9 +36286,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_header_stdc=no
 +	ac_cv_header_stdc=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
-@@ -33749,6 +36340,7 @@
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -33749,6 +36345,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -35705,7 +35929,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -33768,18 +36360,27 @@
+@@ -33768,18 +36365,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -35739,7 +35963,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33792,12 +36393,14 @@
+@@ -33792,12 +36398,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -35757,7 +35981,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -33806,8 +36409,8 @@
+@@ -33806,8 +36414,8 @@
  
  fi
  
@@ -35768,7 +35992,7 @@
  if test "${ac_cv_header_time+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33831,24 +36434,36 @@
+@@ -33831,24 +36439,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -35813,15 +36037,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33857,12 +36472,13 @@
+@@ -33857,12 +36477,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_header_time=no
 +	ac_cv_header_time=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
 -echo "${ECHO_T}$ac_cv_header_time" >&6
@@ -35830,7 +36055,7 @@
  if test $ac_cv_header_time = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -33885,18 +36501,19 @@
+@@ -33885,18 +36506,19 @@
  for ac_header in fcntl.h sys/time.h unistd.h stdlib.h paths.h sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h sys/param.h stdarg.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -35858,7 +36083,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33907,24 +36524,36 @@
+@@ -33907,24 +36529,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -35903,17 +36128,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33933,15 +36562,16 @@
+@@ -33933,15 +36567,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -35925,7 +36151,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33950,8 +36580,13 @@
+@@ -33950,8 +36585,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -35941,7 +36167,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -33975,9 +36610,10 @@
+@@ -33975,9 +36615,10 @@
  
    ac_header_preproc=no
  fi
@@ -35954,7 +36180,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34001,25 +36637,19 @@
+@@ -34001,25 +36642,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;}
@@ -35987,7 +36213,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34035,9 +36665,9 @@
+@@ -34035,9 +36670,9 @@
  for ac_func in usleep
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36000,7 +36226,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -34063,53 +36693,59 @@
+@@ -34063,53 +36698,59 @@
  
  #undef $ac_func
  
@@ -36079,15 +36305,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34118,13 +36754,15 @@
+@@ -34118,13 +36759,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -36098,7 +36325,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -34137,9 +36775,9 @@
+@@ -34137,9 +36780,9 @@
  for ac_func in statvfs
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36111,7 +36338,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -34165,53 +36803,59 @@
+@@ -34165,53 +36808,59 @@
  
  #undef $ac_func
  
@@ -36190,15 +36417,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34220,13 +36864,15 @@
+@@ -34220,13 +36869,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -36209,7 +36437,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -34244,25 +36890,25 @@
+@@ -34244,25 +36895,25 @@
  
  LIBXML_PREFIX=""
  
@@ -36243,7 +36471,7 @@
  XML_WARNING=""
  if test "x$LIBXML_PREFIX" != "x"
  then
-@@ -34285,11 +36931,11 @@
+@@ -34285,11 +36936,11 @@
   ($1* 1000 + $2) * 1000 + $3;}'`
    then
      CXXFLAGS="$CXXFLAGS -DLIBXML_2_5"
@@ -36259,7 +36487,7 @@
    fi
    LIBXML_LIBS="`$XML_CONFIG --libs`"
    LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
-@@ -34302,10 +36948,10 @@
+@@ -34302,10 +36953,10 @@
  
  if test "x${XML_WARNING}" != "x"
  then
@@ -36272,7 +36500,7 @@
  fi
  
  LIBXML_PREFIX_DIR="`$XML_CONFIG --prefix`"
-@@ -34317,24 +36963,24 @@
+@@ -34317,24 +36968,24 @@
  
  LIBXSLT_PREFIX=""
  
@@ -36305,7 +36533,7 @@
  if test "x$LIBXSLT_PREFIX" != "x"
  then
    if ${LIBXSLT_PREFIX}/bin/xslt-config --libs print > /dev/null 2>&1
-@@ -34358,14 +37004,14 @@
+@@ -34358,14 +37009,14 @@
    then
      LIBXSLT_LIBS="-lexslt `$XSLT_CONFIG --libs`"
      LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
@@ -36324,7 +36552,7 @@
      else
        LIBXSLT_PREFIX="$XSLT_CONFIG --prefix"
            fi
-@@ -34386,10 +37032,10 @@
+@@ -34386,10 +37037,10 @@
  
  if test "x${XSLT_WARNING}" != "x"
  then
@@ -36337,7 +36565,7 @@
  fi
  
  
-@@ -34402,15 +37048,14 @@
+@@ -34402,15 +37053,14 @@
  
  
  
@@ -36356,7 +36584,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'
-@@ -34444,24 +37089,36 @@
+@@ -34444,24 +37094,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36401,7 +36629,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34470,9 +37127,10 @@
+@@ -34470,10 +37132,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36409,11 +36637,13 @@
 +	ac_cv_mdi_setup=no
  
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
      CXXFLAGS="$save_CXXFLAGS"
-@@ -34490,15 +37148,15 @@
+     ac_ext=c
+@@ -34490,15 +37153,15 @@
      LIB_KMDI="-lkmdi"
      QEXTMDI_SUBDIR=""
      KMDI_INCLUDES=""
@@ -36433,7 +36663,7 @@
    fi
  
  
-@@ -34520,8 +37178,7 @@
+@@ -34520,8 +37183,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -36443,7 +36673,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'
-@@ -34531,17 +37188,17 @@
+@@ -34531,17 +37193,17 @@
  
  
     if test "${ac_cv_header_cvsservice_stub_h+set}" = set; then
@@ -36467,7 +36697,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34552,24 +37209,36 @@
+@@ -34552,24 +37214,36 @@
  #include <cvsservice_stub.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36512,17 +36742,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34578,15 +37247,16 @@
+@@ -34578,15 +37252,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -36534,7 +36765,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34595,8 +37265,13 @@
+@@ -34595,8 +37270,13 @@
  /* end confdefs.h.  */
  #include <cvsservice_stub.h>
  _ACEOF
@@ -36550,7 +36781,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -34620,9 +37295,10 @@
+@@ -34620,9 +37300,10 @@
  
    ac_header_preproc=no
  fi
@@ -36563,7 +36794,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -34646,25 +37322,18 @@
+@@ -34646,25 +37327,18 @@
  echo "$as_me: WARNING: cvsservice_stub.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: cvsservice_stub.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: cvsservice_stub.h: in the future, the compiler will take precedence" >&2;}
@@ -36594,7 +36825,7 @@
  
  fi
  if test $ac_cv_header_cvsservice_stub_h = yes; then
-@@ -34703,8 +37372,7 @@
+@@ -34703,8 +37377,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -36604,7 +36835,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'
-@@ -34714,17 +37382,17 @@
+@@ -34714,17 +37387,17 @@
  
  
     if test "${ac_cv_header_knewstuff_knewstuffsecure_h+set}" = set; then
@@ -36628,7 +36859,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34735,24 +37403,36 @@
+@@ -34735,24 +37408,36 @@
  #include <knewstuff/knewstuffsecure.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36673,17 +36904,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34761,15 +37441,16 @@
+@@ -34761,15 +37446,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -36695,7 +36927,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34778,8 +37459,13 @@
+@@ -34778,8 +37464,13 @@
  /* end confdefs.h.  */
  #include <knewstuff/knewstuffsecure.h>
  _ACEOF
@@ -36711,7 +36943,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -34803,9 +37489,10 @@
+@@ -34803,9 +37494,10 @@
  
    ac_header_preproc=no
  fi
@@ -36724,7 +36956,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -34829,25 +37516,18 @@
+@@ -34829,25 +37521,18 @@
  echo "$as_me: WARNING: knewstuff/knewstuffsecure.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: knewstuff/knewstuffsecure.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: knewstuff/knewstuffsecure.h: in the future, the compiler will take precedence" >&2;}
@@ -36755,7 +36987,7 @@
  
  fi
  if test $ac_cv_header_knewstuff_knewstuffsecure_h = yes; then
-@@ -34884,13 +37564,13 @@
+@@ -34884,13 +37569,13 @@
  
  
  
@@ -36773,7 +37005,7 @@
  
  if test "$enable_editors" = "yes"; then
    CXXFLAGS="$CXXFLAGS -DENABLE_EDITORS"
-@@ -34909,9 +37589,9 @@
+@@ -34909,9 +37594,9 @@
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -36786,7 +37018,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -34933,24 +37613,36 @@
+@@ -34933,24 +37618,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36831,15 +37063,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34959,12 +37651,14 @@
+@@ -34959,12 +37656,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_Header=no"
 +	eval "$as_ac_Header=no"
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -36849,7 +37082,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -34976,13 +37670,12 @@
+@@ -34976,13 +37675,12 @@
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
@@ -36865,68 +37098,14 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34990,126 +37683,99 @@
+@@ -34990,126 +37688,99 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
 +/* 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.  */
--char opendir ();
--int
--main ()
--{
--opendir ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_search_opendir="none required"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
--  for ac_lib in dir; do
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any gcc2 internal prototype to avoid an error.  */
++   builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -36992,23 +37171,77 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  ac_cv_search_opendir="-l$ac_lib"
--break
+-  ac_cv_search_opendir="none required"
 +  ac_cv_search_opendir=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-fi
+-rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
--  done
+-if test "$ac_cv_search_opendir" = no; then
+-  for ac_lib in dir; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="-l$ac_lib"
+-break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++fi
+ 
++rm -f core conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext
 +  if test "${ac_cv_search_opendir+set}" = set; then
 +  break
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
 +done
 +if test "${ac_cv_search_opendir+set}" = set; then
 +  :
@@ -37043,68 +37276,14 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35117,122 +37783,96 @@
+@@ -35117,122 +37788,96 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
 +/* 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.  */
--char opendir ();
--int
--main ()
--{
--opendir ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_search_opendir="none required"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
--  for ac_lib in x; do
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any gcc2 internal prototype to avoid an error.  */
++   builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -37170,23 +37349,77 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  ac_cv_search_opendir="-l$ac_lib"
--break
+-  ac_cv_search_opendir="none required"
 +  ac_cv_search_opendir=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-fi
+-rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
--  done
+-if test "$ac_cv_search_opendir" = no; then
+-  for ac_lib in x; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="-l$ac_lib"
+-break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++fi
+ 
++rm -f core conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext
 +  if test "${ac_cv_search_opendir+set}" = set; then
 +  break
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
 +done
 +if test "${ac_cv_search_opendir+set}" = set; then
 +  :
@@ -37217,7 +37450,7 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35256,24 +37896,36 @@
+@@ -35256,24 +37901,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37262,18 +37495,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35282,8 +37934,9 @@
+@@ -35282,9 +37939,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_header_stdc=no
 +	ac_cv_header_stdc=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
-@@ -35340,6 +37993,7 @@
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -35340,6 +37998,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -37281,7 +37516,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -35359,18 +38013,27 @@
+@@ -35359,18 +38018,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -37315,7 +37550,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35383,12 +38046,14 @@
+@@ -35383,12 +38051,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -37333,7 +37568,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -35397,8 +38062,8 @@
+@@ -35397,8 +38067,8 @@
  
  fi
  
@@ -37344,7 +37579,7 @@
  if test "${ac_cv_header_time+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35422,24 +38087,36 @@
+@@ -35422,24 +38092,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37389,15 +37624,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35448,12 +38125,13 @@
+@@ -35448,12 +38130,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_header_time=no
 +	ac_cv_header_time=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
 -echo "${ECHO_T}$ac_cv_header_time" >&6
@@ -37406,7 +37642,7 @@
  if test $ac_cv_header_time = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -35470,18 +38148,19 @@
+@@ -35470,18 +38153,19 @@
  for ac_header in fcntl.h sys/time.h unistd.h stdlib.h paths.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37434,7 +37670,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35492,24 +38171,36 @@
+@@ -35492,24 +38176,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37479,17 +37715,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35518,15 +38209,16 @@
+@@ -35518,15 +38214,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -37501,7 +37738,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35535,8 +38227,13 @@
+@@ -35535,8 +38232,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -37517,7 +37754,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -35560,9 +38257,10 @@
+@@ -35560,9 +38262,10 @@
  
    ac_header_preproc=no
  fi
@@ -37530,7 +37767,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -35586,25 +38284,19 @@
+@@ -35586,25 +38289,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;}
@@ -37563,7 +37800,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -35620,9 +38312,9 @@
+@@ -35620,9 +38317,9 @@
  for ac_func in usleep
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -37576,7 +37813,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -35648,53 +38340,59 @@
+@@ -35648,53 +38345,59 @@
  
  #undef $ac_func
  
@@ -37655,15 +37892,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35703,13 +38401,15 @@
+@@ -35703,13 +38406,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -37674,7 +37912,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -35721,8 +38421,8 @@
+@@ -35721,8 +38426,8 @@
  
  #MIN_CONFIG
  
@@ -37685,7 +37923,7 @@
  if test "${ac_cv_c_bigendian+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35748,24 +38448,36 @@
+@@ -35748,24 +38453,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37730,7 +37968,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35791,24 +38503,36 @@
+@@ -35791,24 +38508,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37775,15 +38013,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35817,14 +38541,15 @@
+@@ -35817,14 +38546,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_c_bigendian=no
 +	ac_cv_c_bigendian=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
@@ -37793,7 +38032,7 @@
  if test "$cross_compiling" = yes; then
    # try to guess the endianness by grepping values into an object file
    ac_cv_c_bigendian=unknown
-@@ -35834,11 +38559,11 @@
+@@ -35834,11 +38564,11 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -37809,7 +38048,7 @@
  void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
  int
  main ()
-@@ -35849,24 +38574,36 @@
+@@ -35849,24 +38579,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37854,17 +38093,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35885,7 +38622,9 @@
+@@ -35885,8 +38627,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -35894,27 +38633,41 @@
+ /* confdefs.h.  */
+@@ -35894,27 +38638,41 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -37913,7 +38154,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35927,13 +38680,16 @@
+@@ -35927,13 +38685,16 @@
  ( exit $ac_status )
  ac_cv_c_bigendian=yes
  fi
@@ -37923,8 +38164,9 @@
 +
 +
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6
@@ -37933,7 +38175,7 @@
  case $ac_cv_c_bigendian in
    yes)
  
-@@ -35952,8 +38708,8 @@
+@@ -35952,8 +38713,8 @@
  esac
  
  
@@ -37944,7 +38186,7 @@
  if test "${ac_cv_maxpathlen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35989,8 +38745,8 @@
+@@ -35989,8 +38750,8 @@
  
  fi
  
@@ -37955,7 +38197,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -36001,8 +38757,8 @@
+@@ -36001,8 +38762,8 @@
  
  #MIN_CONFIG(3.2)
  
@@ -37966,7 +38208,7 @@
  if test "${ac_cv_c_bigendian+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36028,24 +38784,36 @@
+@@ -36028,24 +38789,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38011,7 +38253,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36071,24 +38839,36 @@
+@@ -36071,24 +38844,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38056,15 +38298,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36097,14 +38877,15 @@
+@@ -36097,14 +38882,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_c_bigendian=no
 +	ac_cv_c_bigendian=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
@@ -38074,7 +38317,7 @@
  if test "$cross_compiling" = yes; then
    # try to guess the endianness by grepping values into an object file
    ac_cv_c_bigendian=unknown
-@@ -36114,11 +38895,11 @@
+@@ -36114,11 +38900,11 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -38090,7 +38333,7 @@
  void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
  int
  main ()
-@@ -36129,24 +38910,36 @@
+@@ -36129,24 +38915,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38135,17 +38378,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36165,7 +38958,9 @@
+@@ -36165,8 +38963,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 +
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36174,27 +38969,41 @@
+ /* confdefs.h.  */
+@@ -36174,27 +38974,41 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -38194,7 +38439,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36207,13 +39016,16 @@
+@@ -36207,13 +39021,16 @@
  ( exit $ac_status )
  ac_cv_c_bigendian=yes
  fi
@@ -38204,8 +38449,9 @@
 +
 +
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6
@@ -38214,7 +38460,7 @@
  case $ac_cv_c_bigendian in
    yes)
  
-@@ -36232,8 +39044,8 @@
+@@ -36232,8 +39049,8 @@
  esac
  
  
@@ -38225,7 +38471,7 @@
  if test "${ac_cv_maxpathlen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36269,8 +39081,8 @@
+@@ -36269,8 +39086,8 @@
  
  fi
  
@@ -38236,7 +38482,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -36284,13 +39096,13 @@
+@@ -36284,13 +39101,13 @@
  # Process user input to configure
  build_kommander="yes"
  
@@ -38254,7 +38500,7 @@
  
  if test "$build_kommander" = "no"; then
    DO_NOT_COMPILE="$DO_NOT_COMPILE kommander"
-@@ -36307,18 +39119,19 @@
+@@ -36307,18 +39124,19 @@
  for ac_header in sys/types.h unistd.h string.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38282,7 +38528,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36329,24 +39142,36 @@
+@@ -36329,24 +39147,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38327,17 +38573,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36355,15 +39180,16 @@
+@@ -36355,15 +39185,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -38349,7 +38596,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36372,8 +39198,13 @@
+@@ -36372,8 +39203,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -38365,7 +38612,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -36397,9 +39228,10 @@
+@@ -36397,9 +39233,10 @@
  
    ac_header_preproc=no
  fi
@@ -38378,7 +38625,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -36423,25 +39255,19 @@
+@@ -36423,25 +39260,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;}
@@ -38411,7 +38658,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -36462,18 +39288,19 @@
+@@ -36462,18 +39293,19 @@
  for ac_header in ieeefp.h nan.h math.h fp_class.h float.h ansidecl.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38439,7 +38686,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36484,24 +39311,36 @@
+@@ -36484,24 +39316,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38484,17 +38731,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36510,15 +39349,16 @@
+@@ -36510,15 +39354,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -38506,7 +38754,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36527,8 +39367,13 @@
+@@ -36527,8 +39372,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -38522,7 +38770,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -36552,9 +39397,10 @@
+@@ -36552,9 +39402,10 @@
  
    ac_header_preproc=no
  fi
@@ -38535,7 +38783,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -36578,25 +39424,19 @@
+@@ -36578,25 +39429,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;}
@@ -38568,7 +38816,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -36614,18 +39454,19 @@
+@@ -36614,18 +39459,19 @@
  for ac_header in time.h sys/stat.h stdarg.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38596,7 +38844,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36636,24 +39477,36 @@
+@@ -36636,24 +39482,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38641,17 +38889,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36662,15 +39515,16 @@
+@@ -36662,15 +39520,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -38663,7 +38912,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36679,8 +39533,13 @@
+@@ -36679,8 +39538,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -38679,7 +38928,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -36704,9 +39563,10 @@
+@@ -36704,9 +39568,10 @@
  
    ac_header_preproc=no
  fi
@@ -38692,7 +38941,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -36730,25 +39590,19 @@
+@@ -36730,25 +39595,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;}
@@ -38725,7 +38974,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -36765,9 +39619,9 @@
+@@ -36765,9 +39624,9 @@
  for ac_func in stat _stat
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -38738,7 +38987,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36793,53 +39647,59 @@
+@@ -36793,53 +39652,59 @@
  
  #undef $ac_func
  
@@ -38817,15 +39066,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36848,13 +39708,15 @@
+@@ -36848,13 +39713,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -38836,7 +39086,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -36864,8 +39726,8 @@
+@@ -36864,8 +39731,8 @@
  done
  
  
@@ -38847,7 +39097,7 @@
  if test "${ac_cv_func_isnan+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36892,53 +39754,59 @@
+@@ -36892,53 +39759,59 @@
  
  #undef isnan
  
@@ -38926,15 +39176,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36947,18 +39815,19 @@
+@@ -36947,18 +39820,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_isnan=no
 +	ac_cv_func_isnan=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_isnan" >&5
@@ -38951,7 +39202,7 @@
  if test "${ac_cv_lib_m_isnan+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36971,40 +39840,52 @@
+@@ -36971,40 +39845,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39016,15 +39267,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -37013,14 +39894,15 @@
+@@ -37013,14 +39899,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_m_isnan=no
 +	ac_cv_lib_m_isnan=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -39035,7 +39287,7 @@
  if test $ac_cv_lib_m_isnan = yes; then
    M_LIBS="-lm"; cat >>confdefs.h <<\_ACEOF
  #define HAVE_ISNAN 1
-@@ -37031,8 +39913,8 @@
+@@ -37031,8 +39918,8 @@
  fi
  
  
@@ -39046,7 +39298,7 @@
  if test "${ac_cv_func_isinf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37059,53 +39941,59 @@
+@@ -37059,53 +39946,59 @@
  
  #undef isinf
  
@@ -39125,15 +39377,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -37114,18 +40002,19 @@
+@@ -37114,18 +40007,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_isinf=no
 +	ac_cv_func_isinf=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_isinf" >&5
@@ -39150,7 +39403,7 @@
  if test "${ac_cv_lib_m_isinf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37138,40 +40027,52 @@
+@@ -37138,40 +40032,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39215,15 +39468,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -37180,14 +40081,15 @@
+@@ -37180,14 +40086,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_m_isinf=no
 +	ac_cv_lib_m_isinf=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -39234,7 +39488,7 @@
  if test $ac_cv_lib_m_isinf = yes; then
    M_LIBS="-lm"; cat >>confdefs.h <<\_ACEOF
  #define HAVE_ISINF 1
-@@ -37198,8 +40100,8 @@
+@@ -37198,8 +40105,8 @@
  fi
  
  
@@ -39245,7 +39499,7 @@
  if test "${ac_cv_func_pow+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37226,53 +40128,59 @@
+@@ -37226,53 +40133,59 @@
  
  #undef pow
  
@@ -39324,15 +39578,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -37281,18 +40189,19 @@
+@@ -37281,18 +40194,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_pow=no
 +	ac_cv_func_pow=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5
@@ -39349,7 +39604,7 @@
  if test "${ac_cv_lib_m_pow+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37305,40 +40214,52 @@
+@@ -37305,40 +40219,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39414,15 +39669,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -37347,14 +40268,15 @@
+@@ -37347,14 +40273,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_m_pow=no
 +	ac_cv_lib_m_pow=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -39433,7 +39689,7 @@
  if test $ac_cv_lib_m_pow = yes; then
    M_LIBS="-lm"; cat >>confdefs.h <<\_ACEOF
  #define HAVE_POW 1
-@@ -37365,8 +40287,8 @@
+@@ -37365,8 +40292,8 @@
  fi
  
  
@@ -39444,7 +39700,7 @@
  if test "${ac_cv_func_floor+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37393,53 +40315,59 @@
+@@ -37393,53 +40320,59 @@
  
  #undef floor
  
@@ -39524,15 +39780,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -37448,18 +40376,19 @@
+@@ -37448,18 +40381,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_floor=no
 +	ac_cv_func_floor=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_floor" >&5
@@ -39549,7 +39806,7 @@
  if test "${ac_cv_lib_m_pow+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37472,40 +40401,52 @@
+@@ -37472,40 +40406,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39614,15 +39871,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -37514,14 +40455,15 @@
+@@ -37514,14 +40460,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_m_pow=no
 +	ac_cv_lib_m_pow=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -39633,7 +39891,7 @@
  if test $ac_cv_lib_m_pow = yes; then
    M_LIBS="-lm"; cat >>confdefs.h <<\_ACEOF
  #define HAVE_FLOOR 1
-@@ -37532,8 +40474,8 @@
+@@ -37532,8 +40479,8 @@
  fi
  
  
@@ -39644,7 +39902,7 @@
  if test "${ac_cv_func_fabs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37560,53 +40502,59 @@
+@@ -37560,53 +40507,59 @@
  
  #undef fabs
  
@@ -39723,15 +39981,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -37615,18 +40563,19 @@
+@@ -37615,18 +40568,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_func_fabs=no
 +	ac_cv_func_fabs=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_fabs" >&5
@@ -39748,7 +40007,7 @@
  if test "${ac_cv_lib_m_pow+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37639,40 +40588,52 @@
+@@ -37639,40 +40593,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39813,15 +40072,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -37681,14 +40642,15 @@
+@@ -37681,14 +40647,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_m_pow=no
 +	ac_cv_lib_m_pow=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -39832,7 +40092,7 @@
  if test $ac_cv_lib_m_pow = yes; then
    M_LIBS="-lm"; cat >>confdefs.h <<\_ACEOF
  #define HAVE_FABS 1
-@@ -37702,9 +40664,9 @@
+@@ -37702,9 +40669,9 @@
  for ac_func in gettimeofday
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -39845,7 +40105,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37730,53 +40692,59 @@
+@@ -37730,53 +40697,59 @@
  
  #undef $ac_func
  
@@ -39924,15 +40184,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -37785,13 +40753,15 @@
+@@ -37785,13 +40758,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -39943,7 +40204,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -37806,9 +40776,9 @@
+@@ -37806,9 +40781,9 @@
  for ac_func in mktime localtime asctime
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -39956,7 +40217,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37834,53 +40804,59 @@
+@@ -37834,53 +40809,59 @@
  
  #undef $ac_func
  
@@ -40035,15 +40296,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -37889,13 +40865,15 @@
+@@ -37889,13 +40870,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -40054,7 +40316,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -37954,8 +40932,8 @@
+@@ -37954,8 +40937,8 @@
  LDFLAGS="$LDFLAGS $LIBXML_LIBS"
  CFLAGS="$CFLAGS $LIBXML_CFLAGS"
  
@@ -40065,7 +40327,7 @@
  if test "${ac_cv_lib_xml2_xmlSetEntityReferenceFunc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37968,40 +40946,52 @@
+@@ -37968,40 +40951,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -40130,15 +40392,16 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -38010,21 +41000,22 @@
+@@ -38010,21 +41005,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_lib_xml2_xmlSetEntityReferenceFunc=no
 +	ac_cv_lib_xml2_xmlSetEntityReferenceFunc=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
 +
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -40157,7 +40420,7 @@
    debugging of files included as entities. Test 10 will be skipped
    as it will fail.   You will not be able to set breakpoints on external
          entities. Try upgrading your libxml2.
-@@ -38033,7 +41024,7 @@
+@@ -38033,7 +41029,7 @@
    debugging of files included as entities. Test 10 will be skipped
    as it will fail.   You will not be able to set breakpoints on external
          entities. Try upgrading your libxml2.
@@ -40166,7 +40429,7 @@
    RUNTEST10="false"
  
  fi
-@@ -38042,21 +41033,21 @@
+@@ -38042,21 +41038,21 @@
  LDFLAGS="$save_LDFLAGS"
  CFLAGS="$save_CFLAGS"
  
@@ -40194,7 +40457,7 @@
  fi
  
  
-@@ -38082,18 +41073,19 @@
+@@ -38082,18 +41078,19 @@
  for ac_header in pthread.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40222,7 +40485,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38104,24 +41096,36 @@
+@@ -38104,24 +41101,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -40267,17 +40530,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -38130,15 +41134,16 @@
+@@ -38130,15 +41139,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
  
@@ -40289,7 +40553,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38147,8 +41152,13 @@
+@@ -38147,8 +41157,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -40305,7 +40569,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -38172,9 +41182,10 @@
+@@ -38172,9 +41187,10 @@
  
    ac_header_preproc=no
  fi
@@ -40318,7 +40582,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -38198,25 +41209,19 @@
+@@ -38198,25 +41214,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;}
@@ -40351,7 +40615,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -38245,13 +41250,13 @@
+@@ -38245,13 +41255,13 @@
  XSLDBG_INCLUDEDIR="`pwd`/kxsldbg/kxsldbgpart"
  
  docs_macro=true
@@ -40369,7 +40633,7 @@
  
  if test "x$docs_macro" = "xyes"; then
         cat >>confdefs.h <<\_ACEOF
-@@ -38260,17 +41265,17 @@
+@@ -38260,17 +41270,17 @@
  
         if test "x$prefix" != "x"
         then
@@ -40392,7 +40656,7 @@
         On non risc os systems :  XSLDBG_DOCS_DIR
         On risc os systems : XSLDebugDocs\$Dir
         See --enable-docs-macro in ./configure
-@@ -38279,32 +41284,32 @@
+@@ -38279,32 +41289,32 @@
         On non risc os systems :  XSLDBG_DOCS_DIR
         On risc os systems : XSLDebugDocs\$Dir
         See --enable-docs-macro in ./configure
@@ -40434,7 +40698,7 @@
  
  XSLDBG_EXTRA_LIBS=""
  
-@@ -38353,8 +41358,8 @@
+@@ -38353,8 +41363,8 @@
  fi
  
  for i in $ac_topsubdirs; do
@@ -40445,7 +40709,7 @@
    if test -d $srcdir/$i; then
      install_it="yes"
      for j in $DO_NOT_COMPILE; do
-@@ -38365,8 +41370,8 @@
+@@ -38365,8 +41375,8 @@
    else
      install_it="no"
    fi
@@ -40456,7 +40720,7 @@
    vari=`echo $i | sed -e 's,[-+.@],_,g'`
    if test $install_it = "yes"; then
      TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -38458,297 +41463,297 @@
+@@ -38458,297 +41468,297 @@
    quanta_SUBDIR_included_FALSE=
  fi
  
@@ -40900,7 +41164,7 @@
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -38768,39 +41773,58 @@
+@@ -38768,39 +41778,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -40975,7 +41239,7 @@
    fi
  fi
  rm -f confcache
-@@ -38809,38 +41833,31 @@
+@@ -38809,38 +41838,31 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -41027,7 +41291,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
-@@ -38897,6 +41914,13 @@
+@@ -38897,6 +41919,13 @@
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -41041,7 +41305,7 @@
  if test -z "${QUANTAUIRC_HOOK_TRUE}" && test -z "${QUANTAUIRC_HOOK_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"QUANTAUIRC_HOOK\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -39019,11 +42043,35 @@
+@@ -39019,11 +42048,35 @@
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
@@ -41079,7 +41343,7 @@
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
-@@ -39032,8 +42080,43 @@
+@@ -39032,8 +42085,43 @@
  fi
  
  
@@ -41124,7 +41388,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -39047,18 +42130,19 @@
+@@ -39047,18 +42135,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -41147,7 +41411,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -39066,159 +42150,120 @@
+@@ -39066,159 +42155,120 @@
  
  
  # Name of the executable.
@@ -41378,7 +41642,7 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -39227,7 +42272,19 @@
+@@ -39227,7 +42277,19 @@
    as_mkdir_p=false
  fi
  
@@ -41399,7 +41663,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'"
-@@ -39236,31 +42293,14 @@
+@@ -39236,31 +42298,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -41431,11 +41695,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.59d.  Invocation command line was
++generated by GNU Autoconf 2.60.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -39268,30 +42308,20 @@
+@@ -39268,30 +42313,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -41474,7 +41738,7 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -39318,19 +42348,21 @@
+@@ -39318,19 +42353,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -41486,7 +41750,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.59d,
++configured by $0, generated by GNU Autoconf 2.60,
 +  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
@@ -41502,7 +41766,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -39341,39 +42373,24 @@
+@@ -39341,39 +42378,24 @@
  do
    case $1 in
    --*=*)
@@ -41548,7 +41812,7 @@
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -39383,18 +42400,24 @@
+@@ -39383,18 +42405,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -41578,7 +41842,7 @@
  
    esac
    shift
-@@ -39410,182 +42433,194 @@
+@@ -39410,182 +42438,194 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -41929,7 +42193,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
-@@ -39597,546 +42632,738 @@
+@@ -39597,546 +42637,738 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -43153,7 +43417,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -40144,248 +43371,129 @@
+@@ -40144,248 +43376,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -43194,6 +43458,7 @@
 +
 +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
 +  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
 +  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 +which seems to be undefined.  Please make sure it is defined." >&5
 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
@@ -43501,7 +43766,7 @@
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -40396,135 +43504,39 @@
+@@ -40396,135 +43510,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -43663,7 +43928,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.
-@@ -40534,18 +43546,29 @@
+@@ -40534,18 +43552,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
@@ -43701,7 +43966,7 @@
    else
      continue
    fi
-@@ -40567,53 +43590,79 @@
+@@ -40567,53 +43596,79 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -43814,7 +44079,7 @@
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdewebdev, "3.5.3") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdewebdev, "3.5.4") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
@@ -43822,7 +44087,7 @@
  
  dnl generate the config header
 @@ -78,6 +80,8 @@
- AM_INIT_AUTOMAKE(kdewebdev, "3.5.3")
+ AM_INIT_AUTOMAKE(kdewebdev, "3.5.4")
  KDE_ENABLE_HIDDEN_VISIBILITY
  
 +AM_MAINTAINER_MODE
@@ -49773,7 +50038,7 @@
  
  #>+ 2
 -KDE_DIST=kdewebdev.lsm subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in INSTALL.docs Makefile.cvs aclocal.m4 configure.in.in Makefile.am PACKAGING acinclude.m4 VERSION Makefile.am.in 
-+KDE_DIST=kdewebdev.lsm stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs INSTALL.docs aclocal.m4 configure.in.in PACKAGING acinclude.m4 configure Makefile.am VERSION Makefile.am.in 
++KDE_DIST=kdewebdev.lsm stamp-h.in COPYING-DOCS subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs INSTALL.docs aclocal.m4 configure.in.in PACKAGING acinclude.m4 configure Makefile.am VERSION Makefile.am.in 
  
  #>+ 2
  docs-am:




More information about the pkg-kde-commits mailing list